Small cleanup trying to audit the thread code on OSX.