It would be nice to add some V(2)-level logging to these new event handlers just to track what's going on.