Editing: TypeMatcher.php