Factored out clause matchers from addMatchers