Thread Safety Analysis: implement review suggestions from Aaron Ballman.