Classic protocol and crypto cleanups.

Indeed. That was the first step so that I can read through the code. Feel free to do the second step. ;-)