CGE2: Fix remaining shadowed variables