Update for upstream Stream changes.

With the landing of mozilla/rust#8984, we can finally use Stream
meaningfully...