add and improve hasmapto() matchers