Rearrange the logging for the handshake.