diff --git a/kdc/bx509d.c b/kdc/bx509d.c
index 90840b031..d2f397b96 100644
--- a/kdc/bx509d.c
+++ b/kdc/bx509d.c
@@ -1638,8 +1638,7 @@ bnegotiate(struct bx509_request_desc *r)
     if (ret == 0) {
         heim_audit_addkv((heim_svc_req_desc)r, KDC_AUDIT_VIS, "target", "%s",
                          r->target ? r->target : "<unknown>");
-        heim_audit_addkv((heim_svc_req_desc)r, 0, "redir", "%s",
-                         r->redir ? "yes" : "no");
+        heim_audit_addkv_bool((heim_svc_req_desc)r, "redir", !!r->redir);
         ret = validate_token(r);
     }
     /* bnegotiate_get_target() and validate_token() call bad_req() */
diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index 07e1bb022..a324b6894 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -2479,7 +2479,7 @@ _kdc_as_rep(astgs_request_t r)
     /* check for valid set of addresses */
     if (!_kdc_check_addresses(r, b->addresses, r->addr)) {
         if (r->config->warn_ticket_addresses) {
-            _kdc_audit_addkv((kdc_request_t)r, 0, "wrongaddr", "yes");
+            _kdc_audit_addkv_bool((kdc_request_t)r, "wrongaddr", TRUE);
         } else {
             _kdc_set_e_text(r, "Request from wrong address");
             ret = KRB5KRB_AP_ERR_BADADDR;
diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index b7673eb15..66a28edd3 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -1135,7 +1135,7 @@ next_kvno:
         _kdc_audit_addaddrs((kdc_request_t)r, (*ticket)->ticket.caddr, "tixaddrs");
     if (r->config->warn_ticket_addresses && ret == KRB5KRB_AP_ERR_BADADDR &&
         *ticket != NULL) {
-        _kdc_audit_addkv((kdc_request_t)r, 0, "wrongaddr", "yes");
+        _kdc_audit_addkv_bool((kdc_request_t)r, "wrongaddr", TRUE);
         ret = 0;
     }
     if (ret == KRB5KRB_AP_ERR_BAD_INTEGRITY && kvno_search_tries > 0) {
@@ -2340,12 +2340,12 @@ server_lookup:
     if (!_kdc_check_addresses(priv, tgt->caddr, from_addr)) {
         if (config->check_ticket_addresses) {
             ret = KRB5KRB_AP_ERR_BADADDR;
-            _kdc_audit_addkv((kdc_request_t)priv, 0, "wrongaddr", "yes");
+            _kdc_audit_addkv_bool((kdc_request_t)priv, "wrongaddr", TRUE);
             kdc_log(context, config, 4, "Request from wrong address");
             _kdc_audit_addreason((kdc_request_t)priv, "Request from wrong address");
             goto out;
         } else if (config->warn_ticket_addresses) {
-            _kdc_audit_addkv((kdc_request_t)priv, 0, "wrongaddr", "yes");
+            _kdc_audit_addkv_bool((kdc_request_t)priv, "wrongaddr", TRUE);
         }
     }