Strip out some non-standard matchers