Remove some redundancy in sync-all