Rewrite arguments to use subcommands