Changes for stand-alone libcstring support.