More thread safety, a never-ending job.