More sync refactoring.