Michael, the changes for the event handlers turned out to be more complicated than I thought – would you please briefly review? (I'm just worried there's something tricky going on here that I don't know about.)

It should only take you a few minutes to review and merge, read the commit messages and you're done, unless you disagree with the argument.