First tiny changes in preparation of changing of "sess_cert" handling.

Also I've subsituted real tabs for 8-spaces sequences in some lines so that
things don't look that weird with a tab-width of 4.