Continued upgrades to command line processing.