Reduced the number of functions that use the ut-conf buffer local
variable. Fixed a number of issues that cropped up as a result. Fixed
unit tests.