Minor fix to handle command line parsing better.