Make event_stream rtype conform with the rest