Stream doesn't always get wrapped.
A few minor changes.