Code Review feedback from SSL-only cookies.

Fixes #841