Tidy up some more output. The command-line code needs some severe