Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts