The patch makes the code somewhat simpler and prepares it for more complex initialization handshakes.
