Index: compiler/analyser.c
===================================================================
--- compiler/analyser.c	(revision 430)
+++ compiler/analyser.c	(working copy)
@@ -388,9 +388,9 @@
             get_token(a, c_for); continue;
         case 'S':
             {
-                int token = read_token(a->tokeniser);
-                if (token == c_name) name_to_node(a, p, 's'); else
-                if (token == c_literalstring) p->literalstring = new_literalstring(a);
+                int str_token = read_token(a->tokeniser);
+                if (str_token == c_name) name_to_node(a, p, 's'); else
+                if (str_token == c_literalstring) p->literalstring = new_literalstring(a);
                 else error(a, 2);
             }
             continue;
Index: runtime/utilities.c
===================================================================
--- runtime/utilities.c	(revision 430)
+++ runtime/utilities.c	(working copy)
@@ -198,9 +198,9 @@
         int common = common_i < common_j ? common_i : common_j; /* smaller */
         w = v + k;
         {
-            int i; for (i = common; i < w->s_size; i++) {
+            int i2; for (i2 = common; i2 < w->s_size; i2++) {
                 if (c + common == l) { diff = -1; break; }
-                diff = q[common] - w->s[i];
+                diff = q[common] - w->s[i2];
                 if (diff != 0) break;
                 common++;
             }
@@ -258,9 +258,9 @@
         int common = common_i < common_j ? common_i : common_j;
         w = v + k;
         {
-            int i; for (i = w->s_size - 1 - common; i >= 0; i--) {
+            int i2; for (i2 = w->s_size - 1 - common; i2 >= 0; i2--) {
                 if (c - common == lb) { diff = -1; break; }
-                diff = q[- common] - w->s[i];
+                diff = q[- common] - w->s[i2];
                 if (diff != 0) break;
                 common++;
             }