Reduce the size of some of the enumerated types