Make the command line option parsing comprehensive.