Remove statics.
Merge pull request #1166 from ktf/fix-more-statics

Multithreading fixes -- Remove statics.