Simplify diagnostic reporting by returning a stream