Restore events added in #3220 that were lost due to regresssion

Fixes #4841 by restoring events added in #3220 that are still documented but have disappeared from the code.

cc @anitagraham and @mrsweaters.