Trivial changes to command line parsing