simplify Matchers
remove unnecessary indirection