Multithreading fixes -- Remove a few non-const statics.