Improved command line argument parsing.