synch call refactoring

get rid of stupid cut&paste from the past (not as much
as I'd like but it's a first step)