rewrite make-target-delegates matching code