diff --git a/mps/code/arena.c b/mps/code/arena.c
index 1bee7fd7795..6c1990ee880 100644
--- a/mps/code/arena.c
+++ b/mps/code/arena.c
@@ -521,7 +521,6 @@ static Bool arenaDescribeTractsInChunk(Tree tree, void *closureP, Size closureS)
                  (WriteFS)(TractPool(tract)->class->name),
                  NULL);
     if (res != ResOK) return res;
-    return ResOK;
   }
   return ResOK;
 }
diff --git a/mps/code/pool.c b/mps/code/pool.c
index 060da7a47d5..0bcae0e0648 100644
--- a/mps/code/pool.c
+++ b/mps/code/pool.c
@@ -626,7 +626,7 @@ Bool PoolOfAddr(Pool *poolReturn, Arena arena, Addr addr)
 Bool PoolOfRange(Pool *poolReturn, Arena arena, Addr base, Addr limit)
 {
   Bool havePool = FALSE;
-  Pool pool;
+  Pool pool = NULL;
   Tract tract;
   Addr addr, alignedBase, alignedLimit;
 
diff --git a/mps/code/tree.h b/mps/code/tree.h
index 757344c2c64..6c5ea33320e 100644
--- a/mps/code/tree.h
+++ b/mps/code/tree.h
@@ -141,11 +141,11 @@ extern void TreeBalance(Tree *treeIO);
  * tree and next are variables of type Tree.
  * In the body of the loop, tree is the current node.
  */
-#define TREE_DESTROY(treeref, tree, next, root)   \
-  for ((treeref = &(root), TreeToVine(treeref));  \
-       (tree = *treeref) != TreeEMPTY             \
-         ? (next = tree->right, TRUE)             \
-         : (TreeBalance(treeref), FALSE);         \
+#define TREE_DESTROY(treeref, tree, next, root) \
+  for ((treeref = &(root), TreeToVine(treeref), next = TreeEMPTY); \
+       (tree = *treeref) != TreeEMPTY \
+         ? (next = tree->right, TRUE) \
+         : (TreeBalance(treeref), FALSE); \
        *treeref = next)