Get rid of custom matchers in `applyBase`