More around some pthread locks to helgrind

These changes do not effect operation, but eliminate some false
positive errors from helgrind, namely testing some variables values
that are sometimes protected by locks and other times not protected.