Pre mblt swap
This commit contains just some error message fixes and some whitespace removals.
Separated out to make MBLT swap merge easier to review.
This commit contains just some error message fixes and some whitespace removals.
Separated out to make MBLT swap merge easier to review.