Make the code generation produce cleaner C++ code.