Partially genericized and refactored editable fields.