[INTERNAL] some more iostream cleanups