Split out enum value list stuff