Issue #121: further improvements to streaming interface