Classic protocol and crypto cleanups.

The count includes SAUTH itself.