Reduce the patching needed should a distro wish to switch the default from using the system connection by default to using a session connection by default. Should now only require patching the default value and a single test checking the defaults.