This removes almost all uses of the global value.  All that remains is its use
as a default in case no configuration is given.