Handle files conditional on services correctly in the synchroniser