Clean up syncpeer slightly. I wanted to make 'syncpeer' removable
in any situation, but that's not practical without making the
function much more complicated. And it's already too complicated.