More thread safe, although it doesn't matter much here