Improved command line parser.