Lots of cleanups around command line parsing