Various clean-ups to the structured logging and logging context code.