Retyping some enums to differentiate between selection TYPE and selection SHAPE