Prep for refactoring of events.