Spagettifix the nonce negotiation

Mostly just remove the duplicate send. The rest were little changes
while finding the fix. :-/