Further C++ generation improvements.