Change some uses of CString functions to CAString instead