--- constmrg.c__  Mon Aug  9 23:56:52 2004
+++ constmrg.c  Sun Sep  5 00:27:52 2004
@@ -90,14 +90,14 @@
           {
             // Move the label group of Constant2 into Constant1.
             SYMBOL *CurSymbol, *NextSymbol;
-            for (CurSymbol = Symbol2; CurSymbol && CurSymbol->Location == Symbol2->Location; CurSymbol = NextSymbol)
+            for (CurSymbol = Symbol2; CurSymbol && CurSymbol->Location == Constant2Start; CurSymbol = NextSymbol)
             {
               NextSymbol = GetNext (CurSymbol);
               // Don't move the section symbol.
               if (CurSymbol == Section2->SectionSymbol) continue;
               Unlink (Section2->Symbols, CurSymbol);
               CurSymbol->Parent = Section1;
-              CurSymbol->Location = Symbol1->Location;
+              CurSymbol->Location = Constant1Start;
               InsertBefore (Section1->Symbols, CurSymbol, NextSymbol1);
             }
             // Delete Constant2.
@@ -110,7 +110,7 @@
               // won't always be caught by the loop.
               Unlink (Section2->Symbols, Section2->SectionSymbol);
               Section2->SectionSymbol->Parent = Section1;
-              Section2->SectionSymbol->Location = Symbol1->Location;
+              Section2->SectionSymbol->Location = Constant1Start;
               InsertBefore (Section1->Symbols, Section2->SectionSymbol, NextSymbol1);
               // If the Section2 was the next Section1, we must update NextSection1.
               if (Section2 == NextSection1)
@@ -133,14 +133,14 @@
           {
             // Move the label group of Constant1 into Constant2.
             SYMBOL *CurSymbol, *NextSymbol;
-            for (CurSymbol = Symbol1; CurSymbol && CurSymbol->Location == Symbol1->Location; CurSymbol = NextSymbol)
+            for (CurSymbol = Symbol1; CurSymbol && CurSymbol->Location == Constant1Start; CurSymbol = NextSymbol)
             {
               NextSymbol = GetNext (CurSymbol);
               // Don't move the section symbol.
               if (CurSymbol == Section1->SectionSymbol) continue;
               Unlink (Section1->Symbols, CurSymbol);
               CurSymbol->Parent = Section2;
-              CurSymbol->Location = Symbol2->Location;
+              CurSymbol->Location = Constant2Start;
               InsertBefore (Section2->Symbols, CurSymbol, NextSymbol2);
             }
             // Delete Constant1.
@@ -153,7 +153,7 @@
               // won't always be caught by the loop.
               Unlink (Section1->Symbols, Section1->SectionSymbol);
               Section1->SectionSymbol->Parent = Section2;
-              Section1->SectionSymbol->Location = Symbol2->Location;
+              Section1->SectionSymbol->Location = Constant2Start;
               InsertBefore (Section2->Symbols, Section1->SectionSymbol, NextSymbol2);
               // Free the section.
               FreeSection (Section1);
@@ -200,7 +200,7 @@
             {
               SYMBOL *CurSymbol, *NextSymbol;
               // Move the label group of Constant1 into the new section.
-              for (CurSymbol = Symbol1; CurSymbol && CurSymbol->Location == Symbol1->Location; CurSymbol = NextSymbol)
+              for (CurSymbol = Symbol1; CurSymbol && CurSymbol->Location == Constant1Start; CurSymbol = NextSymbol)
               {
                 NextSymbol = GetNext (CurSymbol);
                 // Don't move the section symbol.
@@ -211,7 +211,7 @@
                 Append (Section->Symbols, CurSymbol);
               }
               // Move the label group of Constant2 into the new section.
-              for (CurSymbol = Symbol2; CurSymbol && CurSymbol->Location == Symbol2->Location; CurSymbol = NextSymbol)
+              for (CurSymbol = Symbol2; CurSymbol && CurSymbol->Location == Constant2Start; CurSymbol = NextSymbol)
               {
                 NextSymbol = GetNext (CurSymbol);
                 // Don't move the section symbol.