More fixes to the command line usage.