Perf improvement for events (thanks @AaronO)