Remove more excess .String() conversions.