Simplify the raw_svector_ostream tweak from r212816