Fixed #3852: Support simplification of C++11 "enum class", fixed existing simplifications