Update for enum namespacing

These are C-style enums - they should be in the root namespace. I even wonder if some should be `bitflags!`...