Changed the TLS Certificate structure again.
Trying to address feedback by Jeff Hutzelman.