Split up the CLI options code.

It was starting to get a little unwieldy with the amount of options defined in a
single method. The options have now been split up into separate methods.