diff --git a/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
index b04293267..0edea5418 100644
--- a/lib/krb5/auth_context.c
+++ b/lib/krb5/auth_context.c
@@ -46,11 +46,11 @@ krb5_auth_con_init(krb5_context context,
 {
     krb5_auth_context p;
 
-    p = ALLOC(1, krb5_auth_context_data);;
+    ALLOC(p, 1);
     if(!p)
 	return ENOMEM;
     memset(p, 0, sizeof(*p));
-    p->authenticator = ALLOC(1, krb5_authenticator_data);
+    ALLOC(p->authenticator, 1);
     if (!p->authenticator)
 	return ENOMEM;
     p->flags = KRB5_AUTH_CONTEXT_DO_TIME;
diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index fa0ab2155..214512c68 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -45,7 +45,7 @@ krb5_init_context(krb5_context *context)
 {
     krb5_context p;
     const char *tmp;
-    p = ALLOC(1, krb5_context_data);
+    ALLOC(p, 1);
     if(!p)
 	return ENOMEM;
     memset(p, 0, sizeof(krb5_context_data));
@@ -103,7 +103,7 @@ static krb5_error_code
 default_etypes(krb5_enctype **etype)
 {
   krb5_enctype *p;
-  p = ALLOC(4, krb5_enctype);
+  ALLOC(p, 4);
   if(!p)
     return ENOMEM;
   p[0] = ETYPE_DES_CBC_MD5;
@@ -127,7 +127,7 @@ krb5_set_default_in_tkt_etypes(krb5_context context,
       if(!valid_etype(etypes[i++]))
 	return KRB5_PROG_ETYPE_NOSUPP;
     ++i;
-    p = ALLOC(i, krb5_enctype);
+    ALLOC(p, i);
     if(!p)
       return ENOMEM;
     memmove(p, etypes, i * sizeof(krb5_enctype));
@@ -150,7 +150,7 @@ krb5_get_default_in_tkt_etypes(krb5_context context,
   if(context->etypes) {
     for(i = 0; context->etypes[i]; i++);
     ++i;
-    p = ALLOC(i, krb5_enctype);
+    ALLOC(p, i);
     if(!p)
       return ENOMEM;
     memmove(p, context->etypes, i * sizeof(krb5_enctype));
diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c
index 53aa11f65..7190e90bc 100644
--- a/lib/krb5/keytab.c
+++ b/lib/krb5/keytab.c
@@ -50,7 +50,7 @@ krb5_kt_resolve(krb5_context context,
   if (strncmp (name, "FILE:", 5) != 0)
     return -1;
 
-  k = ALLOC(1, krb5_keytab_data);
+  ALLOC(k, 1);
   if (k == NULL)
     return ENOMEM;
   k->filename = strdup(name + 5);
@@ -236,7 +236,7 @@ krb5_kt_ret_principal(krb5_storage *sp,
     krb5_principal p;
     int16_t tmp;
     
-    p = ALLOC(1, krb5_principal_data);
+    ALLOC(p, 1);
     if(p == NULL)
 	return ENOMEM;
 
diff --git a/lib/krb5/store.c b/lib/krb5/store.c
index c5e8f9dd6..a25569452 100644
--- a/lib/krb5/store.c
+++ b/lib/krb5/store.c
@@ -411,7 +411,7 @@ krb5_ret_addrs(krb5_storage *sp, krb5_addresses *adr)
     ret = krb5_ret_int32(sp, &tmp);
     if(ret) return ret;
     adr->len = tmp;
-    adr->val = ALLOC(adr->len, krb5_address);
+    ALLOC(adr->val, adr->len);
     for(i = 0; i < adr->len; i++){
 	ret = krb5_ret_address(sp, &adr->val[i]);
 	if(ret) break;