We have a generic walker at https://github.com/mongodb/mongo/blob/master/src/mongo/db/query/tree_walker.h which is used for MatchExpressions. It would be nice to find a way to get the flexibility improvements made by SERVER-54709 applied to both walkers or to merge them into one entity with the benefits of both.