Some cleanup starting down the road to thread safety.