Minor tweak to previous commit.

The goal is to avoid certain kinds of very rare multi-threaed races.