stream: Simplify event listeners

A suggestion for making the stream listeners simpler.