Might as well go all Reentrant

It's likely that the synchronized blocks along with the reentrant locks
were causing the deadlock I was seeing in my dev testing.  I'm going to
push this build a little harder in testing to see how it stands up.