Added some basic simplification for the matchers