Leveler: Some adjustments to new event system.