Minor efficiency improvements plus a synchronization fix in server example.