Major refactorings in CertificateManager.