CGE2: More refactoring in cge2.h and cge2.cpp.