To avoid the limitations of splitMatchByModifiedFields for $expr expressions, we can instead simply copy the full user $match and rewrite the entire tree. Return nullptr for a predicate/expression if the associated field is not in the set of fields to be rewritten OR not in the set of fields for which a rewrite exists.