Get rid of match_type.