Ensure subcommands are always used in preference to larger-scope
commands