Improvements on the DeviceType class.