Improve performance of `/sync` in a few situations.