Easier-to-Parse Output Format

A handful of smaller fixes, and the removal of the three-dash prefix on the output lines.
It should be easier to parse in a script.