MDL-40052 events: Coding style improvments