Work in progress update.
Fix more enum class invalid operations (Daniel K).