Some more cleanup. Introduce a class to hold event names.