diff --git a/mc_util.c b/mc_util.c
index f29c7cb9..4a01edbe 100644
--- a/mc_util.c
+++ b/mc_util.c
@@ -350,13 +350,13 @@ static int check_sblock_tail_string(mblck_list_t *sblcks, int length)
 {
     mblck_node_t *blckptr;
     char         *dataptr;
-    uint32_t      bodylen = MBLCK_GET_BODYLEN(sblcks);
+    uint32_t      bodylen = MBLCK_BDLEN(sblcks);
     uint32_t      lastlen;
     uint32_t      numblks;
 
     /* check the last "\r\n" string */
-    blckptr = MBLCK_GET_TAILBLK(sblcks);
-    dataptr = MBLCK_GET_BODYPTR(blckptr);
+    blckptr = MBLCK_TAIL(sblcks);
+    dataptr = DATA_MBLCK(blckptr);
     lastlen = (length % bodylen) > 0
             ? (length % bodylen) : bodylen;
 
@@ -364,12 +364,12 @@ static int check_sblock_tail_string(mblck_list_t *sblcks, int length)
         return -1; /* invalid strings */
     }
     if ((--lastlen) == 0) {
-        numblks = MBLCK_GET_NUMBLKS(sblcks);
-        blckptr = MBLCK_GET_HEADBLK(sblcks);
+        numblks = MBLCK_COUNT(sblcks);
+        blckptr = MBLCK_HEAD(sblcks);
         for (int i = 1; i < numblks-1; i++) {
-             blckptr = MBLCK_GET_NEXTBLK(blckptr);
+             blckptr = NEXT_MBLCK(blckptr);
         }
-        dataptr = MBLCK_GET_BODYPTR(blckptr);
+        dataptr = DATA_MBLCK(blckptr);
         lastlen = bodylen;
     }
     if (*(dataptr + lastlen - 1) != '\r') {
@@ -430,7 +430,7 @@ static ENGINE_ERROR_CODE concat_segmented_tokens(mblck_list_t *blist, token_t *t
     char         *dataptr;
     char         *saveptr;
     token_t      *tok_ptr;
-    uint32_t      bodylen = MBLCK_GET_BODYLEN(blist);
+    uint32_t      bodylen = MBLCK_BDLEN(blist);
     uint32_t      numblks = 1;
     uint32_t      datalen = 0;
     uint32_t      complen, i;
@@ -458,8 +458,8 @@ static ENGINE_ERROR_CODE concat_segmented_tokens(mblck_list_t *blist, token_t *t
     }
 
     /* build the complete strings with new mblock */
-    blckptr = MBLCK_GET_HEADBLK(&newblcks);
-    dataptr = MBLCK_GET_BODYPTR(blckptr);
+    blckptr = MBLCK_HEAD(&newblcks);
+    dataptr = DATA_MBLCK(blckptr);
     datalen = 0;
 
     for (i = 0; i < nsegtok; i++) {
@@ -467,8 +467,8 @@ static ENGINE_ERROR_CODE concat_segmented_tokens(mblck_list_t *blist, token_t *t
         complen = segtoks[i].length + tok_ptr->length;
 
         if ((datalen + complen) > bodylen) {
-            blckptr = MBLCK_GET_NEXTBLK(blckptr);
-            dataptr = MBLCK_GET_BODYPTR(blckptr);
+            blckptr = NEXT_MBLCK(blckptr);
+            dataptr = DATA_MBLCK(blckptr);
             datalen = 0;
         }
 
@@ -499,7 +499,7 @@ ENGINE_ERROR_CODE tokenize_mblocks(mblck_list_t *blist, int keylen, int keycnt,
     assert(keylen > 0 && keycnt > 0 && tokens != NULL);
     mblck_node_t *blckptr;
     char         *dataptr;
-    uint32_t bodylen = MBLCK_GET_BODYLEN(blist);
+    uint32_t bodylen = MBLCK_BDLEN(blist);
     uint32_t numblks = ((keylen - 1) / bodylen) + 1;
     uint32_t lastlen = (keylen % bodylen) > 0
                      ? (keylen % bodylen) : bodylen;
@@ -521,8 +521,8 @@ ENGINE_ERROR_CODE tokenize_mblocks(mblck_list_t *blist, int keylen, int keycnt,
     nsegtok = 0;
     /* get the first block */
     chkblks = 1;
-    blckptr = MBLCK_GET_HEADBLK(blist);
-    dataptr = MBLCK_GET_BODYPTR(blckptr);
+    blckptr = MBLCK_HEAD(blist);
+    dataptr = DATA_MBLCK(blckptr);
     datalen = (chkblks < numblks) ? bodylen : lastlen;
 
     while (ntokens < keycnt) {
@@ -562,8 +562,8 @@ ENGINE_ERROR_CODE tokenize_mblocks(mblck_list_t *blist, int keylen, int keycnt,
 
         /* get the next block */
         chkblks += 1;
-        blckptr = MBLCK_GET_NEXTBLK(blckptr);
-        dataptr = MBLCK_GET_BODYPTR(blckptr);
+        blckptr = NEXT_MBLCK(blckptr);
+        dataptr = DATA_MBLCK(blckptr);
         datalen = (chkblks < numblks) ? bodylen : lastlen;
 
         if (segmented_blck == false)
diff --git a/mc_util.h b/mc_util.h
index 2c09b1c5..9d6d78d2 100644
--- a/mc_util.h
+++ b/mc_util.h
@@ -62,14 +62,14 @@ typedef struct _mblck_pool {
 /*
  * memory block macros
  */
-#define MBLCK_GET_HEADBLK(l) ((l)->head)
-#define MBLCK_GET_TAILBLK(l) ((l)->tail)
-#define MBLCK_GET_NUMBLKS(l) ((l)->blck_cnt)
-#define MBLCK_GET_BODYLEN(l) ((l)->body_len)
-#define MBLCK_GET_ITEMCNT(l) ((l)->item_cnt)
-#define MBLCK_GET_ITEMLEN(l) ((l)->item_len)
-#define MBLCK_GET_NEXTBLK(b) ((b)->next)
-#define MBLCK_GET_BODYPTR(b) ((b)->data)
+#define MBLCK_HEAD(l) ((l)->head)
+#define MBLCK_TAIL(l) ((l)->tail)
+// #define MBLCK_ICNT(l) ((l)->item_cnt)
+// #define MBLCK_ILEN(l) ((l)->item_len)
+#define MBLCK_COUNT(l) ((l)->blck_cnt)
+#define MBLCK_BDLEN(l) ((l)->body_len)
+#define NEXT_MBLCK(b) ((b)->next)
+#define DATA_MBLCK(b) ((b)->data)
 
 /* memory block functions */
 int  mblck_pool_create(mblck_pool_t *pool, uint32_t blck_len, uint32_t blck_cnt);
diff --git a/memcached.c b/memcached.c
index 805cf28b..9d0600b2 100644
--- a/memcached.c
+++ b/memcached.c
@@ -1007,10 +1007,10 @@ static void ritem_set_first(conn *c, int rtype, int vleng)
     c->rtype = rtype;
 
     if (c->rtype == CONN_RTYPE_MBLCK) {
-        c->membk = MBLCK_GET_HEADBLK(&c->memblist);
-        c->ritem = MBLCK_GET_BODYPTR(c->membk);
-        c->rlbytes = vleng < MBLCK_GET_BODYLEN(&c->memblist)
-                   ? vleng : MBLCK_GET_BODYLEN(&c->memblist);
+        c->membk = MBLCK_HEAD(&c->memblist);
+        c->ritem = DATA_MBLCK(c->membk);
+        c->rlbytes = vleng < MBLCK_BDLEN(&c->memblist)
+                   ? vleng : MBLCK_BDLEN(&c->memblist);
         c->rltotal = vleng;
     }
     else if (c->rtype == CONN_RTYPE_HINFO) {
@@ -1060,10 +1060,10 @@ static void ritem_set_next(conn *c)
     assert(c->rltotal > 0);
 
     if (c->rtype == CONN_RTYPE_MBLCK) {
-        c->membk = MBLCK_GET_NEXTBLK(c->membk);
-        c->ritem = MBLCK_GET_BODYPTR(c->membk);
-        c->rlbytes = c->rltotal < MBLCK_GET_BODYLEN(&c->memblist)
-                   ? c->rltotal : MBLCK_GET_BODYLEN(&c->memblist);
+        c->membk = NEXT_MBLCK(c->membk);
+        c->ritem = DATA_MBLCK(c->membk);
+        c->rlbytes = c->rltotal < MBLCK_BDLEN(&c->memblist)
+                   ? c->rltotal : MBLCK_BDLEN(&c->memblist);
     }
     else if (c->rtype == CONN_RTYPE_HINFO) {
         c->ritem = c->hinfo.addnl[c->rindex]->ptr;