Remove uses of Streams.h from CommandLine.cpp, fix some whitespace and other minor...