followup improvements to #1
use map-stream
0.2.0