Simplification: removing special handling of NeverMatcher