DDF-534

Some initial cleanups and the start of the work on making options / arguments common across different console commands.

This isn't enough to solve DD-534 completely.
Will do.