Converted EventType anonymous classes into static inner classes