More work on command line parsing.