fixed overzealous event type classes