Final cleanup after move to leaner EVP_PKEY methods