Another step towards thread safety.