See if this simplifies code and allow custom stream modifications.