Well unfortunately I wasn't able to find a solution for that CC ref problem yet, so I dropped those patches for now. Guess I'll have to use them locally when analyzing leaks…
I also used minimum compat mode in the event constructor table, I think it's the most clean this way, IMO, even tidying up the constructor slightly. Those event types don't exist in older modes anyway.