Refactoring; transition on generation of cpp code.