Even more string cleanup.

Still a lot to clean up!