Revert "Initial attempt in reducing string duplication throughout the project...not quite done, but will continue to do so."

This reverts commit 08d228fc1d44adc86f1edfdd3ee94ffde1573b8d.

Not going to be able to finish this now, and it adds complexity.  So put this work in a new branch to pick up later.