I think that in the first pass we should not be adding an encounter to any visit and rely on saveEncounter to assign the transferred encounter to a visit.