More move to raw_ostream.