Fixed merge issue with C++ codegen in this file.