Wider adoption of SchemaInferenceStack shows that we are lacking the ability to follow data tree from choice/case nodes. This is counter-intuitive – choice already has the notion of searching case nodes – hence indexing data tree children does make sense.
While we are reconsidering things, it might well be suitable for groupings as well.