Index: kernel/generic/src/adt/avl.c
===================================================================
--- kernel/generic/src/adt/avl.c	(revision 5dcee525bccbdcd56e08f5269158e2d305ff94d3)
+++ kernel/generic/src/adt/avl.c	(revision 83a5cba0066dd013f87382960bf1e6ac17b2ea89)
@@ -108,4 +108,48 @@
 }
 
+#define REBALANCE_INSERT_XX(DIR1, DIR2)		\
+	top->DIR1 = par->DIR2;			\
+	if (top->DIR1 != NULL)			\
+		top->DIR1->par = top;		\
+	par->par = top->par;			\
+	top->par = par;				\
+	par->DIR2 = top;			\
+	par->balance = 0;			\
+	top->balance = 0;			\
+	*dpc = par;
+
+#define REBALANCE_INSERT_LL()		REBALANCE_INSERT_XX(lft, rgt)
+#define REBALANCE_INSERT_RR()		REBALANCE_INSERT_XX(rgt, lft)
+
+#define REBALANCE_INSERT_XY(DIR1, DIR2, SGN)	\
+	gpa = par->DIR2;			\
+	par->DIR2 = gpa->DIR1;			\
+	if (gpa->DIR1 != NULL)			\
+		gpa->DIR1->par = par;		\
+	gpa->DIR1 = par;			\
+	par->par = gpa;				\
+	top->DIR1 = gpa->DIR2;			\
+	if (gpa->DIR2 != NULL)			\
+		gpa->DIR2->par = top;		\
+	gpa->DIR2 = top;			\
+	gpa->par = top->par;			\
+	top->par = gpa;				\
+						\
+	if (gpa->balance == -1 * SGN) {		\
+		par->balance = 0;		\
+		top->balance = 1 * SGN;		\
+	} else if (gpa->balance == 0) {		\
+		par->balance = 0;		\
+		top->balance = 0;		\
+	} else {				\
+		par->balance = -1 * SGN;	\
+		top->balance = 0;		\
+	}					\
+	gpa->balance = 0;			\
+	*dpc = gpa;
+
+#define REBALANCE_INSERT_LR()		REBALANCE_INSERT_XY(lft, rgt, 1)
+#define REBALANCE_INSERT_RL()		REBALANCE_INSERT_XY(rgt, lft, -1)
+	
 /** Insert new node into AVL tree.
  *
@@ -146,5 +190,5 @@
 
 	/*
-	 * Initialize new node.
+	 * Initialize the new node.
 	 */
 	newnode->key = key;
@@ -163,5 +207,5 @@
 
 	/*
-	 * Insert new node into previously found leaf place.
+	 * Insert the new node into the previously found leaf position.
 	 */
 	*dpc = newnode;
@@ -210,13 +254,5 @@
 			 * LL rotation.
 			 */
-			top->lft = par->rgt;
-			if (top->lft != NULL)
-				top->lft->par = top;
-			par->par = top->par;
-			top->par = par;
-			par->rgt = top;
-			par->balance = 0;
-			top->balance = 0;
-			*dpc = par;
+			REBALANCE_INSERT_LL();
 		} else { 
 			/*
@@ -225,29 +261,5 @@
 			ASSERT(par->balance == 1);
 			
-			gpa = par->rgt;
-			par->rgt = gpa->lft;
-			if (gpa->lft != NULL)
-				gpa->lft->par = par;
-			gpa->lft = par;
-			par->par = gpa;
-			top->lft = gpa->rgt;
-			if (gpa->rgt != NULL)
-				gpa->rgt->par = top;
-			gpa->rgt = top;
-			gpa->par = top->par;
-			top->par = gpa;
-			
-			if (gpa->balance == -1) {
-				par->balance = 0;
-				top->balance = 1;
-			} else if (gpa->balance == 0) {
-				par->balance = 0;
-				top->balance = 0;
-			} else {
-				par->balance = -1;
-				top->balance = 0;
-			}
-			gpa->balance = 0;
-			*dpc = gpa;
+			REBALANCE_INSERT_LR();
 		}
 	} else if (top->balance == 2) { 
@@ -257,13 +269,5 @@
 			 * RR rotation.
 			 */
-			top->rgt = par->lft;
-			if (top->rgt != NULL)
-				top->rgt->par = top;
-			par->par = top->par;
-			top->par = par;
-			par->lft = top;
-			par->balance = 0;
-			top->balance = 0;
-			*dpc = par;
+			REBALANCE_INSERT_RR();
 		} else {
 			/*
@@ -271,30 +275,6 @@
 			 */
 			ASSERT(par->balance == -1);
-			
-			gpa = par->lft;
-			par->lft = gpa->rgt;
-			if (gpa->rgt != NULL)
-				gpa->rgt->par = par;
-			gpa->rgt = par;
-			par->par = gpa;
-			top->rgt = gpa->lft;
-			if (gpa->lft != NULL)
-				gpa->lft->par = top;
-			gpa->lft = top;
-			gpa->par = top->par;
-			top->par = gpa;
-
-			if (gpa->balance == 1) {
-				par->balance = 0;
-				top->balance = -1;
-			} else if (gpa->balance == 0) {
-				par->balance = 0;
-				top->balance = 0;
-			} else {
-				par->balance = 1;
-				top->balance = 0;
-			}
-			gpa->balance = 0;
-			*dpc = gpa;
+		
+			REBALANCE_INSERT_RL();
 		}
 	} else { 
@@ -352,5 +332,5 @@
 }
 
-#define REBALANCE(DIR1, DIR2, SIGN)		\
+#define REBALANCE_DELETE(DIR1, DIR2, SIGN)	\
 	if (cur->balance == -1 * SIGN) {	\
 		par->balance = 0;		\
@@ -375,6 +355,6 @@
 	cur->balance = 0;
 
-#define REBALANCE_LR()		REBALANCE(lft, rgt, 1)
-#define REBALANCE_RL()		REBALANCE(rgt, lft, -1)
+#define REBALANCE_DELETE_LR()		REBALANCE_DELETE(lft, rgt, 1)
+#define REBALANCE_DELETE_RL()		REBALANCE_DELETE(rgt, lft, -1)
 
 /** Delete a node from the AVL tree.
@@ -516,5 +496,5 @@
 					 * factor of the grand child (cur).
 					 */
-					REBALANCE_RL();
+					REBALANCE_DELETE_RL();
 					
 					/*
@@ -612,5 +592,5 @@
 					 * factor of the grand child (cur).
 					 */
-					REBALANCE_LR();
+					REBALANCE_DELETE_LR();
 
 					/*