Converted the remaining event-stream calls to use through2 #1