Make the handling of driver-only settings more consistent

There seemed to be two different ways these were handled.  Pick one of
them and embrace it.