This is generally pretty easy to clean up... and we probably should try to clean this stuff up as we go along if we don't plan to fix all logging usage in one go (which I'm not recommending).