0.2.1
Simplify stream-to-buffer marginally