Refactor all the commands to be Commands from the Args package.  Also use CommandRunner for the top-level command.