Clean up options code a bit to make use of commandLine.inc's parsing