don't include Zippy::CatalogMatchers everywhere by default