CGE2: Fix the case of a couple of constants, remove a useless variable