Redid parsing of command line options.