Improve VCR matchers