Simplify promise-based sync loop slightly