Classic protocol and crypto cleanups.