A few performance improvements for events with a large number of fields