Simplify leak fix of r207076, by just disposing the previous CXString.