Make formatting of some return codes conforming to the general style. (#5587)

6 files changed