Preserve logging context in a few more places, drop the logging context after...

Preserve logging context in a few more places, drop the logging context after it has been stashed to reduce potential for confusion