Clean-up of command line parser helpers.

Just moving them about a little, and clarifying that 'options' is what we
have, not a configuration.

Signed-off-by: Magnus Therning <magnus@therning.org>