Fix enum values not collapsing to internalids