Small change to command line handling.