Better support for {:as :stream}

Fixes #8