Change FOREIGN-ENUM-VALUE and -KEY to just ENUM-VALUE and -KEY because convenience