Merge "Cleanup some of the thread merging."