Another couple of tweaks to how the fixture is stored for bug #7906.  It now saves the DeviceID in only one place.  That makes it easy to change.