More enum class clean up

Authored by sgerlach on May 23 2020, 4:10 PM.