Clean up a few statics.
Merge pull request #945 from ktf/cleanup-few-statics

Multithreading fixes -- Clean up a few statics.