Streams 159

Pull request open on apache too.
Small nit: This might deserve a TODO: prefix.