More tweaking of CLI output.