[imp #42] Synchronization actor code clean-up

Open this PR for comments.
There may be other commits in order to fix the remaining dirty bits of the synchronization code.