Fix Stream refactoring when using xhr-streaming transport
Address code review remarks