Drop CFParseMatcher and parse_type