Classic protocol and crypto cleanups.

Something is up with your indentation here.  Either the } should be less indented or the return should be more indented.