Classic protocol and crypto cleanups.

Ah !  Good - missed that; OK, happy now.