Minor re-org of the event publisher