[Pki-devel] [PATCH] more typesafety changes