CGE2: Rearrange things a bit in cge2.h.