Even more work on command line parsing.