CGE: Remove a useless structure member, reduce a variable scope