Cleaned up some global 'enums'.