Some cleanup of the Unit and UnitType classes