Add Matcher and MatcherFunc types.