- Patch #191073 by Keith: another good string cleanup by Keith. (Also removed some trailing whitespace.)