Renumber handshake message numbers. Fixes #106, Fixes #108