More output standardization

There should only be output string changes in this commit and therefore
should be riskless.