Previously we just kept the stream around till the next embedded object
or document end and hoped that the stream wrapper is deleted before the
underlying stream goes away.

Change-Id: If2bdb1e664d803fc48d06204fe3aef72b279b5b6