Move more to raw_ostream.