[hooks] match_rtype and match_rtype_sets don't need to extend match_search_state The only method actually used by those 2 classes is __str__ that is defined on ExpectedValueSelector, not match_search_state.