Some tiny changes to the source code to make future diffs smaller

when restructuring the cert_st handling (removed unnused parts,
and the like).
Submitted by:
Reviewed by:
PR: