More robust handling of CLI unsyncing