MDL-40052 events: Code style fixes