Fix events, remove request-stream reference.