fixes #569; C++ codegen works again