ENH: Command-line output fixes.