Still more flag enum (prep)