new: Use enum
type for all unit enums.
#75
+95
−198
Merged