Move standard matchers away from MatchHistory class