Better handle changes to the accessibility hierarchy while matching.