Classic protocol and crypto cleanups.

Typo!