Correctly handle command line parameters.