Improve ModifyEnumerationList logic.