Improvements to CSwitch and StringUtils.