Further improved generated C++