More work on bug #7579.  A modification to the devices table.