Dynamic completion sort order is not correct

See test cases affected by #6369, e.g. flags are wrapped around subcommand names