Made command line output less cluttered (and, in one case, less misleadi...

...ng).