I think other commands might be doing hacky stuff to remove the subcommand name from the argv array. This is much better, but we need to check each command to fix them for this change.