ENG-4898 Finished refactoring for multiple stream support.