Modest cleanups of TString usage