Clean up for cxxgen.py