Fix issue with more complex enums which have member fields and ctor