Make things use format-err / format-out.
Merge pull request #697 from waywardmonkeys/format-err

Make things use format-err / format-out.