Change to avoid initialization and copying of MatchPolicy object.