Replace all enum types with masks