* commit 'e693fa3e184f7a49f9bf912a0dac057fb339b8a4': Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
* commit 'e693fa3e184f7a49f9bf912a0dac057fb339b8a4': Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.