Finish fixing up event_kwargs fixes