BZ1047879 - GRE regression in handling nested enum values. More tests and fixes.