CGE2: Some more minor cleanup