Improve the semantics of the matchers used in specs