Simplified synchronization in ClientUpdateTask a bit.
Code cleanup/commenting/reorganization.