Rearranged proxy replayWhen matchers to a similar grammar as predicates