Fix syntax errors in C++ mode.