state server upgrade sync refactoring

Various clean ups for the recent state server upgrade synchronisation work.
why not change the type of the argument to names.MachineTag then it's the callers problem to pass the right value