Backport newer prototype macros, that delegate using the prototype system and not directly. FIxes #134771, and make this closer to trunk BUG:134771
Changed paths: