More refactoring (and hopefully simplification) of the events.