Fix toString for new matchers