Fix handling of arg-less events