fix OnEachStream
1.8.3
deal with bad keys more gracefully
1.8.4
major code shuffle