Fix CArrayFor in C++.