Pull stream-wrapper fixes.