More work towards bug #7468.  All of the device classes are done now.