Some more thread-safety.