Added C++11 enum goodness.