Cleaned up CertKeyFilename handling