Additional fixes to non-thread version
Correct some errors in previous non-threaded changes. With these changes unit tests in non-threaded versions pass again.
Related to [GL #4424] and [GL #4459 (closed)], fixup of !8786 (merged).
Correct some errors in previous non-threaded changes. With these changes unit tests in non-threaded versions pass again.
Related to [GL #4424] and [GL #4459 (closed)], fixup of !8786 (merged).