Improve command line parsing.