I wound up going with the last suggestion and merging that in before string freeze.  So this PR needs to be updated to use the new strings.