Small thread-safety addendum