Improve the CertStore code a little.