Issue #26: Eliminate use of ThreadLock implementations