[cvs-nhc98] Change a couple of remaining types PackedString to CString