More choice/array fixes
Don't set attributes for unset enums