MDL-39959 events: Code style fixes