Merge "Revert "Revert "More pthreads cleanup."""