Fix the commandline argument parsing.