Do you want to merge this PR in first, so the new CPP generation code becomes part of the history? I’ll send a new PR to remove the C++ stuff afterwards.

Or would you prefer if I updated this PR so it removes the C++ stuff in one go?