Also, propagate around previous improvements to stream slurping. Fix some test cases.
Attach a file by drag & drop or click to upload