More consolidation into an event-handling module.