Revert enum handling to basic-foreign-type, though