Eliminate some more untracked string allocations.