Minor cleanups of Event module code