Code review improvements (making syncing mechanism more flexible).