RajGopal Srinivasan noted that the latest code doesn't work when

running in a non-threaded environment.  He added some #ifdefs that fix
this.