Further optimizations to event states.