Use MatchMixin

issue3867
review5271002