More sync-all refactoring