Merge "More pthreads cleanup."