Fix switch fallthrough and use of raw enumset.