Start a bit of a cleanup on some of the pupa event handling.