Use streams2 (fixes #1)