Thread-safety and removal of extraneous logging, thanks to Phil Dennis <phil@booksys...