Tidy up the server code for endgame handshakes
Merge github.com:ajroetker/nertz