diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index eec3bc48b76..ca50852c975 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -3337,7 +3337,7 @@ make_range (exp, pin_p, plow, phigh)
 	  if (TREE_CODE_CLASS (code) == '2' 
 	      || TREE_CODE_CLASS (code) == '<'
 	      || (TREE_CODE_CLASS (code) == 'e' 
-		  && tree_code_length[(int) code] > 1))
+		  && TREE_CODE_LENGTH (code) > 1))
 	    arg1 = TREE_OPERAND (exp, 1);
 	}
 
@@ -4748,10 +4748,9 @@ fold (expr)
 	   do arithmetic on them.  */
 	wins = 0;
     }
-  else if (kind == 'e' || kind == '<'
-	   || kind == '1' || kind == '2' || kind == 'r')
+  else if (IS_EXPR_CODE_CLASS (kind) || kind == 'r')
     {
-      register int len = tree_code_length[(int) code];
+      register int len = TREE_CODE_LENGTH (code);
       register int i;
       for (i = 0; i < len; i++)
 	{