Hygiene: Separate init code path for events

Change-Id: Icb5d0de14924a351a836eb31189956714b4bbcc0