Replace XT_MATCH_ITERATE macro
Dissolve do_match function