Remove alt_matchers
Finish transition to explicit API