Simplify spec matchers