Remove more statics.
Merge pull request #946 from ktf/cleanup-few-statics-2

Multithreaded fixes -- Remove more statics.