Fix cluster flags with new-style enums.