Another round of string concat cleanups.