Fix after merge: fix again resolve values and valueOf of enums.