Fix for regression dealing with command line args.