Thread-safety cleanup.