Preparing to clean up command line parsing.