Refactoring some of the streaming output stuff. More...