Well observed. I prefer not to change functionality as part of this refactoring, but I'm happy to open an issue/pr for that. - Also not sure what the intended behavior should be (should we modify `c` to be as permissive as with `x/y`, or should we be more strict about `x/y` shape?    Edit: Issue added #12735