tidy up thread safety a bit in the job farmer