Better s2s handshakes.

Much more consistent.