improve compare-matchers more