Classic protocol and crypto cleanups.

Indeed, I changed the comparison here but not the message, will fix.