For ENG-5865, fix yet more ownership issues. Refcount stream blocks in export