...while the change in the thread-wrapper implementation was drop-in, this test in the existing from is questionable: it actually tests locking