Convert EventStream Paper Streams to Users

`end` at 31, 4 is not aligned with `if` at 27, 17