Refactoring supporting Stream base classes.