CGE2: Get rid of more unused variables.