Classic protocol and crypto cleanups.

(Pre-existing) Poor phrasing.  "We can check only for second" can be misread as "We can't check for first but we can for second" where what it means is "Checking for second is enough, as ..."