Delete extra semicolons [-Wextra-semi].
Fix the use of the C++11 extension for enum