Ok. I thought the changes were unrelated to the thread leak fix. Since they are, I'll just merge them all.