Initial fix for CPython issue #14037: subcommand grouping.