update some enumerations to lose the typedefs, those are unnecessary. get rid of a warning by using some open/close braces. also, because I left out this import bit of information in my last commit message, we are no using C++11! woohoo modernity!