Remove unnecessary event-generics, fixing 35171ba.