This required a change to logging, which now uses a singleton pattern. For all future checkins, 'make codecheck' should pass.