Fix: subclass Matcher instead of BaseMatcher

BaseMatcher has been eliminated upstream.