*** empty log message ***

17 files changed, 177 insertions, 182 deletions

diff --git a/src/bltChain.C b/src/bltChain.C
index 4ddaa11..df686e8 100644
--- a/src/bltChain.C
+++ b/src/bltChain.C
@@ -200,7 +200,7 @@ Blt_ChainLink Blt::Chain_Append(Blt_Chain chain, ClientData clientData)
 
   link = Chain_NewLink();
   Chain_LinkAfter(chain, link, (Blt_ChainLink)NULL);
-  Blt_Chain_SetValue(link, clientData);
+  Chain_SetValue(link, clientData);
   return link;
 }
 
@@ -210,7 +210,7 @@ Blt_ChainLink Blt::Chain_Prepend(Blt_Chain chain, ClientData clientData)
 
   link = Chain_NewLink();
   Chain_LinkBefore(chain, link, (Blt_ChainLink)NULL);
-  Blt_Chain_SetValue(link, clientData);
+  Chain_SetValue(link, clientData);
   return link;
 }
 
diff --git a/src/bltChain.h b/src/bltChain.h
index d660c26..64dab62 100644
--- a/src/bltChain.h
+++ b/src/bltChain.h
@@ -34,14 +34,14 @@
 
 #include <tcl.h>
 
-#define Chain_GetLength(c)	(((c) == NULL) ? 0 : (c)->nLinks)
-#define Chain_FirstLink(c)	(((c) == NULL) ? NULL : (c)->head)
-#define Chain_LastLink(c)	(((c) == NULL) ? NULL : (c)->tail)
-#define Chain_PrevLink(l)	((l)->prev)
-#define Chain_NextLink(l) 	((l)->next)
-#define Chain_GetValue(l)  	((l)->clientData)
-#define Chain_FirstValue(c)	(((c)->head == NULL) ? NULL : (c)->head->clientData)
-#define Chain_SetValue(l, value) ((l)->clientData = (ClientData)(value))
+#define Chain_GetLength(c) (((c) == NULL) ? 0 : (c)->nLinks)
+#define Chain_FirstLink(c) (((c) == NULL) ? NULL : (c)->head)
+#define Chain_LastLink(c) (((c) == NULL) ? NULL : (c)->tail)
+#define Chain_PrevLink(l) ((l)->prev)
+#define Chain_NextLink(l) ((l)->next)
+#define Chain_GetValue(l) ((l)->clientData)
+#define Chain_FirstValue(c) (((c)->head == NULL) ? NULL : (c)->head->clientData)
+#define Chain_SetValue(l, v) ((l)->clientData = (ClientData)(v))
 #define Chain_AppendLink(c, l) (Chain_LinkAfter((c), (l), (Blt_ChainLink)NULL))
 #define Chain_PrependLink(c, l) (Chain_LinkBefore((c), (l), (Blt_ChainLink)NULL))
 
@@ -56,8 +56,6 @@ namespace Blt {
     ClientData clientData;	/* Pointer to the data object */
   };
 
-  typedef int (Blt_ChainCompareProc)(Blt_ChainLink *l1Ptr, Blt_ChainLink *l2Ptr);
-
   struct _Blt_Chain {
     Blt_ChainLink head;		/* Pointer to first element in chain */
     Blt_ChainLink tail;		/* Pointer to last element in chain */
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index eadb7f8..6ca648d 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -623,8 +623,8 @@ void Axis::draw(Drawable drawable)
     ts.yPad_ = 0;
 
     for (Blt_ChainLink link=Chain_FirstLink(tickLabels_); link;
-	 link = Blt_Chain_NextLink(link)) {	
-      TickLabel* labelPtr = (TickLabel*)Blt_Chain_GetValue(link);
+	 link = Chain_NextLink(link)) {	
+      TickLabel* labelPtr = (TickLabel*)Chain_GetValue(link);
       ts.drawText(drawable, labelPtr->string, labelPtr->anchorPos.x, 
 		  labelPtr->anchorPos.y);
     }
@@ -1029,8 +1029,8 @@ void Axis::freeTickLabels()
 {
   Blt_Chain chain = tickLabels_;
   for (Blt_ChainLink link=Chain_FirstLink(chain); link;
-       link = Blt_Chain_NextLink(link)) {
-    TickLabel* labelPtr = (TickLabel*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    TickLabel* labelPtr = (TickLabel*)Chain_GetValue(link);
     delete labelPtr;
   }
   Chain_Reset(chain);
@@ -1608,8 +1608,8 @@ void Axis::makeSegments(AxisInfo *infoPtr)
       if (!inRange(t1, &axisRange_))
 	continue;
 
-      TickLabel* labelPtr = (TickLabel*)Blt_Chain_GetValue(link);
-      link = Blt_Chain_NextLink(link);
+      TickLabel* labelPtr = (TickLabel*)Chain_GetValue(link);
+      link = Chain_NextLink(link);
       Segment2d seg;
       makeTick(t1, infoPtr->t1, infoPtr->axis, &seg);
       // Save tick label X-Y position
@@ -1732,8 +1732,8 @@ void Axis::print(PSOutput* psPtr)
     ts.yPad_ = 0;
 
     for (Blt_ChainLink link=Chain_FirstLink(tickLabels_); link; 
-	 link = Blt_Chain_NextLink(link)) {
-      TickLabel *labelPtr = (TickLabel*)Blt_Chain_GetValue(link);
+	 link = Chain_NextLink(link)) {
+      TickLabel *labelPtr = (TickLabel*)Chain_GetValue(link);
       ts.printText(psPtr, labelPtr->string, labelPtr->anchorPos.x, 
 		   labelPtr->anchorPos.y);
     }
diff --git a/src/bltGrElem.C b/src/bltGrElem.C
index cee8a88..7050057 100644
--- a/src/bltGrElem.C
+++ b/src/bltGrElem.C
@@ -238,7 +238,7 @@ PenStyle** Element::StyleMap()
   int nWeights = MIN(ops->w ? ops->w->nValues() : 0, nPoints);
   double* w = ops->w ? ops->w->values_ : NULL;
   Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
-  PenStyle* stylePtr = (PenStyle*)Blt_Chain_GetValue(link);
+  PenStyle* stylePtr = (PenStyle*)Chain_GetValue(link);
 
   // Create a style mapping array (data point index to style), 
   // initialized to the default style.
@@ -249,7 +249,7 @@ PenStyle** Element::StyleMap()
   for (int ii=0; ii<nWeights; ii++) {
     for (link=Chain_LastLink(ops->stylePalette); link; 
 	 link=Chain_PrevLink(link)) {
-      stylePtr = (PenStyle*)Blt_Chain_GetValue(link);
+      stylePtr = (PenStyle*)Chain_GetValue(link);
 
       if (stylePtr->weight.range > 0.0) {
 	double norm = (w[ii] - stylePtr->weight.min) / stylePtr->weight.range;
@@ -271,9 +271,9 @@ void Element::freeStylePalette(Blt_Chain stylePalette)
   Blt_ChainLink link = Chain_FirstLink(stylePalette);
   if (link) {
     Blt_ChainLink next;
-    for (link=Blt_Chain_NextLink(link); link; link=next) {
-      next = Blt_Chain_NextLink(link);
-      PenStyle *stylePtr = (PenStyle*)Blt_Chain_GetValue(link);
+    for (link=Chain_NextLink(link); link; link=next) {
+      next = Chain_NextLink(link);
+      PenStyle *stylePtr = (PenStyle*)Chain_GetValue(link);
       Pen* penPtr = stylePtr->penPtr;
       if (penPtr) {
 	penPtr->refCount_--;
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index 9717b13..bdea07a 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -239,7 +239,7 @@ int BarElement::configure()
     link = Chain_AllocLink(sizeof(BarStyle));
     Chain_LinkAfter(ops->stylePalette, link, NULL);
   }
-  BarStyle* stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
+  BarStyle* stylePtr = (BarStyle*)Chain_GetValue(link);
   stylePtr->penPtr = NORMALPEN(ops);
 
   return TCL_OK;
@@ -447,8 +447,8 @@ void BarElement::map()
 
   // Set the symbol size of all the pen styles
   for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
-       link = Blt_Chain_NextLink(link)) {
-    BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
     BarPen* penPtr = stylePtr->penPtr;
     BarPenOptions* pops = (BarPenOptions*)penPtr->ops();
     stylePtr->symbolSize = size;
@@ -670,9 +670,9 @@ void BarElement::draw(Drawable drawable)
 
   int count = 0;
   for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
-       link = Blt_Chain_NextLink(link)) {
+       link = Chain_NextLink(link)) {
 
-    BarStyle* stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
+    BarStyle* stylePtr = (BarStyle*)Chain_GetValue(link);
     BarPen* penPtr = (BarPen*)stylePtr->penPtr;
     BarPenOptions* pops = (BarPenOptions*)penPtr->ops();
 
@@ -754,9 +754,9 @@ void BarElement::print(PSOutput* psPtr)
 
   int count = 0;
   for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
-       link = Blt_Chain_NextLink(link)) {
+       link = Chain_NextLink(link)) {
 
-    BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
+    BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
     BarPen* penPtr = (BarPen*)stylePtr->penPtr;
     BarPenOptions* pops = (BarPenOptions*)penPtr->ops();
 
@@ -841,8 +841,8 @@ void BarElement::printSymbol(PSOutput* psPtr, double x, double y, int size)
 void BarElement::ResetStylePalette(Blt_Chain stylePalette)
 {
   for (Blt_ChainLink link = Chain_FirstLink(stylePalette); link; 
-       link = Blt_Chain_NextLink(link)) {
-    BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
     stylePtr->xeb.length = 0;
     stylePtr->yeb.length = 0;
     stylePtr->nBars = 0;
@@ -883,7 +883,7 @@ void BarElement::mergePens(BarStyle** dataToStyle)
 
   if (Chain_GetLength(ops->stylePalette) < 2) {
     Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
-    BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
+    BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
     stylePtr->nBars = nBars_;
     stylePtr->bars = bars_;
     stylePtr->symbolSize = bars_->width / 2;
@@ -901,8 +901,8 @@ void BarElement::mergePens(BarStyle** dataToStyle)
     XRectangle* bp = bars;
     int* ip = barToData;
     for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link; 
-	 link = Blt_Chain_NextLink(link)) {
-      BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
+	 link = Chain_NextLink(link)) {
+      BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
       stylePtr->symbolSize = bp->width / 2;
       stylePtr->bars = bp;
       for (int ii=0; ii<nBars_; ii++) {
@@ -926,8 +926,8 @@ void BarElement::mergePens(BarStyle** dataToStyle)
     int* map = new int[xeb_.length];
     int* ip = map;
     for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
-	 link; link = Blt_Chain_NextLink(link)) {
-      BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
       stylePtr->xeb.segments = sp;
       for (int ii=0; ii<xeb_.length; ii++) {
 	int iData = xeb_.map[ii];
@@ -950,8 +950,8 @@ void BarElement::mergePens(BarStyle** dataToStyle)
     int* map = new int[yeb_.length];
     int* ip = map;
     for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link; 
-	 link = Blt_Chain_NextLink(link)) {
-      BarStyle *stylePtr = (BarStyle*)Blt_Chain_GetValue(link);
+	 link = Chain_NextLink(link)) {
+      BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
       stylePtr->yeb.segments = sp;
       for (int ii=0; ii<yeb_.length; ii++) {
 	int iData = yeb_.map[ii];
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 79e6d1a..f65a574 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -293,7 +293,7 @@ int LineElement::configure()
     link = Chain_AllocLink(sizeof(LineStyle));
     Chain_LinkAfter(ops->stylePalette, link, NULL);
   } 
-  LineStyle* stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+  LineStyle* stylePtr = (LineStyle*)Chain_GetValue(link);
   stylePtr->penPtr = NORMALPEN(ops);
 
   return TCL_OK;
@@ -362,8 +362,8 @@ void LineElement::map()
 
   // Set the symbol size of all the pen styles
   for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
-       link = Blt_Chain_NextLink(link)) {
-    LineStyle* stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    LineStyle* stylePtr = (LineStyle*)Chain_GetValue(link);
     LinePen* penPtr = (LinePen *)stylePtr->penPtr;
     LinePenOptions* penOps = (LinePenOptions*)penPtr->ops();
     int size = scaleSymbol(penOps->symbol.size);
@@ -546,8 +546,8 @@ void LineElement::draw(Drawable drawable)
   if (ops->reqMaxSymbols > 0) {
     int total = 0;
     for (Blt_ChainLink link=Chain_FirstLink(ops->stylePalette); link;
-	 link=Blt_Chain_NextLink(link)) {
-      LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+	 link=Chain_NextLink(link)) {
+      LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       total += stylePtr->symbolPts.length;
     }
     symbolInterval_ = total / ops->reqMaxSymbols;
@@ -556,8 +556,8 @@ void LineElement::draw(Drawable drawable)
 
   unsigned int count =0;
   for (Blt_ChainLink link=Chain_FirstLink(ops->stylePalette); link;
-       link=Blt_Chain_NextLink(link)) {
-    LineStyle* stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+       link=Chain_NextLink(link)) {
+    LineStyle* stylePtr = (LineStyle*)Chain_GetValue(link);
     LinePen* penPtr = (LinePen *)stylePtr->penPtr;
     LinePenOptions* penOps = (LinePenOptions*)penPtr->ops();
 
@@ -675,8 +675,8 @@ void LineElement::print(PSOutput* psPtr)
   if (ops->reqMaxSymbols > 0) {
     int total = 0;
     for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
-	 link; link = Blt_Chain_NextLink(link)) {
-      LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       total += stylePtr->symbolPts.length;
     }
     symbolInterval_ = total / ops->reqMaxSymbols;
@@ -685,8 +685,8 @@ void LineElement::print(PSOutput* psPtr)
 
   unsigned int count =0;
   for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
-       link = Blt_Chain_NextLink(link)) {
-    LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
     LinePen* penPtr = (LinePen *)stylePtr->penPtr;
     LinePenOptions* penOps = (LinePenOptions*)penPtr->ops();
     XColor* colorPtr = penOps->errorBarColor;
@@ -1359,7 +1359,7 @@ void LineElement::mergePens(LineStyle **styleMap)
 
   if (Chain_GetLength(ops->stylePalette) < 2) {
     Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
-    LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+    LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
     stylePtr->symbolPts.length = symbolPts_.length;
     stylePtr->symbolPts.points = symbolPts_.points;
     stylePtr->xeb.length = xeb_.length;
@@ -1375,8 +1375,8 @@ void LineElement::mergePens(LineStyle **styleMap)
     Point2d *pp = points;
     int* ip = map;
     for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
-	 link; link = Blt_Chain_NextLink(link)) {
-      LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       stylePtr->symbolPts.points = pp;
       for (int ii=0; ii<symbolPts_.length; ii++) {
 	int iData = symbolPts_.map[ii];
@@ -1399,8 +1399,8 @@ void LineElement::mergePens(LineStyle **styleMap)
     int* map = new int[xeb_.length];
     int* ip = map;
     for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
-	 link; link = Blt_Chain_NextLink(link)) {
-      LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       stylePtr->xeb.segments = sp;
       for (int ii=0; ii<xeb_.length; ii++) {
 	int iData = xeb_.map[ii];
@@ -1423,8 +1423,8 @@ void LineElement::mergePens(LineStyle **styleMap)
     int* map = new int [yeb_.length];
     int* ip = map;
     for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
-	 link; link = Blt_Chain_NextLink(link)) {
-      LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       stylePtr->yeb.segments = sp;
       for (int ii=0; ii<yeb_.length; ii++) {
 	int iData = yeb_.map[ii];
@@ -1541,8 +1541,8 @@ void LineElement::saveTrace(int start, int length, MapInfo* mapPtr)
 void LineElement::freeTraces()
 {
   for (Blt_ChainLink link = Chain_FirstLink(traces_); link;
-       link = Blt_Chain_NextLink(link)) {
-    bltTrace* tracePtr = (bltTrace*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    bltTrace* tracePtr = (bltTrace*)Chain_GetValue(link);
     delete [] tracePtr->screenPts.map;
     delete [] tracePtr->screenPts.points;
     delete tracePtr;
@@ -1685,8 +1685,8 @@ void LineElement::reset()
   freeTraces();
 
   for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
-       link = Blt_Chain_NextLink(link)) {
-    LineStyle *stylePtr = (LineStyle*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
     stylePtr->symbolPts.length = 0;
     stylePtr->xeb.length = 0;
     stylePtr->yeb.length = 0;
@@ -1886,10 +1886,10 @@ int LineElement::closestTrace()
   dMin = searchPtr->dist;
   closest.x = closest.y = 0;		/* Suppress compiler warning. */
   for (link = Chain_FirstLink(traces_); link;
-       link = Blt_Chain_NextLink(link)) {
+       link = Chain_NextLink(link)) {
     Point2d *p, *pend;
 
-    bltTrace *tracePtr = (bltTrace*)Blt_Chain_GetValue(link);
+    bltTrace *tracePtr = (bltTrace*)Chain_GetValue(link);
     for (p = tracePtr->screenPts.points, 
 	   pend = p + (tracePtr->screenPts.length - 1); p < pend; p++) {
       Point2d b;
@@ -2342,8 +2342,8 @@ void LineElement::drawSymbols(Drawable drawable, LinePen* penPtr, int size,
 void LineElement::drawTraces(Drawable drawable, LinePen* penPtr)
 {
   for (Blt_ChainLink link = Chain_FirstLink(traces_); link;
-       link = Blt_Chain_NextLink(link)) {
-    bltTrace* tracePtr = (bltTrace*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    bltTrace* tracePtr = (bltTrace*)Chain_GetValue(link);
 
     int count = tracePtr->screenPts.length; 
     XPoint* points = new XPoint[count];
@@ -2496,8 +2496,8 @@ void LineElement::printTraces(PSOutput* psPtr, LinePen* penPtr)
 {
   setLineAttributes(psPtr, penPtr);
   for (Blt_ChainLink link = Chain_FirstLink(traces_); link;
-       link = Blt_Chain_NextLink(link)) {
-    bltTrace *tracePtr = (bltTrace*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    bltTrace *tracePtr = (bltTrace*)Chain_GetValue(link);
     if (tracePtr->screenPts.length > 0) {
       psPtr->append("% start trace\n");
       psPtr->printMaxPolyline(tracePtr->screenPts.points, 
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 535f252..ee3cc78 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -253,7 +253,7 @@ static int ClosestOp(ClientData clientData, Tcl_Interp* interp,
     // exactly, the last one picked will be the topmost.  
     for (Blt_ChainLink link=Chain_LastLink(graphPtr->elements_.displayList);
 	 link; link = Chain_PrevLink(link)) {
-      Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+      Element* elemPtr = (Element*)Chain_GetValue(link);
       ElementOptions* eops = (ElementOptions*)elemPtr->ops();
       if (!eops->hide)
 	elemPtr->closest();
@@ -369,8 +369,8 @@ static int LowerOp(ClientData clientData, Tcl_Interp* interp,
 
   // Append the links to end of the display list
   Blt_ChainLink link, next;
-  for (link = Chain_FirstLink(chain); link != NULL; link = next) {
-    next = Blt_Chain_NextLink(link);
+  for (link = Chain_FirstLink(chain); link; link = next) {
+    next = Chain_NextLink(link);
     Chain_UnlinkLink(chain, link); 
     Chain_LinkAfter(graphPtr->elements_.displayList, link, NULL); 
   }	
@@ -434,7 +434,7 @@ static int RaiseOp(ClientData clientData, Tcl_Interp* interp,
 
   // Prepend the links to beginning of the display list in reverse order
   Blt_ChainLink link, prev;
-  for (link = Chain_LastLink(chain); link != NULL; link = prev) {
+  for (link = Chain_LastLink(chain); link; link = prev) {
     prev = Chain_PrevLink(link);
     Chain_UnlinkLink(chain, link); 
     Chain_LinkBefore(graphPtr->elements_.displayList, link, NULL); 
@@ -474,8 +474,8 @@ static int ShowOp(ClientData clientData, Tcl_Interp* interp,
 
   // Clear the links from the currently displayed elements
   for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList);
-       link; link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->link = NULL;
   }
   Chain_Destroy(graphPtr->elements_.displayList);
@@ -483,8 +483,8 @@ static int ShowOp(ClientData clientData, Tcl_Interp* interp,
 
   // Set links on all the displayed elements
   for (Blt_ChainLink link = Chain_FirstLink(chain); link; 
-       link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->link = link;
   }
 
@@ -534,8 +534,8 @@ static Tcl_Obj *DisplayListObj(Graph* graphPtr)
 {
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
 
-  for (Blt_ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+  for (Blt_ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name_, -1);
     Tcl_ListObjAppendElement(graphPtr->interp_, listObjPtr, objPtr);
   }
diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C
index 1dfc217..47f2421 100644
--- a/src/bltGrElemOption.C
+++ b/src/bltGrElemOption.C
@@ -246,11 +246,11 @@ int StyleSetProc(ClientData clientData, Tcl_Interp* interp,
     Chain_LinkAfter(stylePalette, link, NULL);
   }
 
-  PenStyle* stylePtr = (PenStyle*)Blt_Chain_GetValue(link);
+  PenStyle* stylePtr = (PenStyle*)Chain_GetValue(link);
   stylePtr->penPtr = NORMALPEN(ops);
   for (int ii = 0; ii<objc; ii++) {
     link = Chain_AllocLink(size);
-    stylePtr = (PenStyle*)Blt_Chain_GetValue(link);
+    stylePtr = (PenStyle*)Chain_GetValue(link);
     stylePtr->weight.min = (double)ii;
     stylePtr->weight.max = (double)ii + 1.0;
     stylePtr->weight.range = 1.0;
@@ -274,15 +274,15 @@ Tcl_Obj* StyleGetProc(ClientData clientData, Tk_Window tkwin,
   // count how many
   int cnt =0;
   for (Blt_ChainLink link = Chain_FirstLink(stylePalette); !link; 
-       link = Blt_Chain_NextLink(link), cnt++) {}
+       link = Chain_NextLink(link), cnt++) {}
   if (!cnt)
     return Tcl_NewListObj(0, (Tcl_Obj**)NULL);
 
   Tcl_Obj** ll = new Tcl_Obj*[3*cnt];
   int ii=0;
   for (Blt_ChainLink link = Chain_FirstLink(stylePalette); !link; 
-       link = Blt_Chain_NextLink(link)) {
-    PenStyle *stylePtr = (PenStyle*)Blt_Chain_GetValue(link);
+       link = Chain_NextLink(link)) {
+    PenStyle *stylePtr = (PenStyle*)Chain_GetValue(link);
     ll[ii++] = Tcl_NewStringObj(stylePtr->penPtr->name_, -1);
     ll[ii++] = Tcl_NewDoubleObj(stylePtr->weight.min);
     ll[ii++] = Tcl_NewDoubleObj(stylePtr->weight.max);
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index 32f678c..0914fe8 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -267,8 +267,8 @@ void Legend::map(int plotWidth, int plotHeight)
   int maxHeight =0;
   TextStyle ts(graphPtr_, &ops->style);
   for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
-       link; link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
     if (!elemOps->label)
@@ -375,8 +375,8 @@ void Legend::map(int plotWidth, int plotHeight)
   int col =0;
   int count =0;
   for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
-       link; link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     count++;
     elemPtr->row_ = row;
     elemPtr->col_ = col;
@@ -455,8 +455,8 @@ void Legend::draw(Drawable drawable)
   TextStyle ts(graphPtr_, &ops->style);
 
   for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList);
-       link; link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
     if (!elemOps->label)
       continue;
@@ -575,8 +575,8 @@ void Legend::print(PSOutput* psPtr)
   TextStyle ts(graphPtr_, &ops->style);
 
   for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
-       link; link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
     if (!elemOps->label)
@@ -782,8 +782,8 @@ int Legend::selectRange(Element *fromPtr, Element *toPtr)
 {
   if (Chain_IsBefore(fromPtr->link, toPtr->link)) {
     for (Blt_ChainLink link=fromPtr->link; link; 
-	 link=Blt_Chain_NextLink(link)) {
-      Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+	 link=Chain_NextLink(link)) {
+      Element* elemPtr = (Element*)Chain_GetValue(link);
       selectEntry(elemPtr);
       if (link == toPtr->link)
 	break;
@@ -792,7 +792,7 @@ int Legend::selectRange(Element *fromPtr, Element *toPtr)
   else {
     for (Blt_ChainLink link=fromPtr->link; link;
 	 link=Chain_PrevLink(link)) {
-      Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+      Element* elemPtr = (Element*)Chain_GetValue(link);
       selectEntry(elemPtr);
       if (link == toPtr->link)
 	break;
@@ -875,8 +875,8 @@ Element* Legend::getNextRow(Element* focusPtr)
 {
   int col = focusPtr->col_;
   int row = focusPtr->row_ + 1;
-  for (Blt_ChainLink link=focusPtr->link; link; link=Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+  for (Blt_ChainLink link=focusPtr->link; link; link=Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
     if (!elemOps->label)
@@ -892,8 +892,8 @@ Element* Legend::getNextColumn(Element* focusPtr)
 {
   int col = focusPtr->col_ + 1;
   int row = focusPtr->row_;
-  for (Blt_ChainLink link=focusPtr->link; link; link=Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+  for (Blt_ChainLink link=focusPtr->link; link; link=Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
     if (!elemOps->label)
@@ -910,7 +910,7 @@ Element* Legend::getPreviousRow(Element* focusPtr)
   int col = focusPtr->col_;
   int row = focusPtr->row_ - 1;
   for (Blt_ChainLink link=focusPtr->link; link; link=Chain_PrevLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
     if (!elemOps->label)
@@ -927,7 +927,7 @@ Element* Legend::getPreviousColumn(Element* focusPtr)
   int col = focusPtr->col_ - 1;
   int row = focusPtr->row_;
   for (Blt_ChainLink link=focusPtr->link; link; link=Chain_PrevLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
     if (!elemOps->label)
@@ -942,8 +942,8 @@ Element* Legend::getPreviousColumn(Element* focusPtr)
 Element* Legend::getFirstElement()
 {
   for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList);
-       link; link=Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+       link; link=Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
     if (elemOps->label)
       return elemPtr;
@@ -955,7 +955,7 @@ Element* Legend::getLastElement()
 {
   for (Blt_ChainLink link=Chain_LastLink(graphPtr_->elements_.displayList); 
        link; link=Chain_PrevLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
     if (elemOps->label)
       return elemPtr;
@@ -987,8 +987,8 @@ ClientData Legend::pickEntry(int xx, int yy, ClassId* classIdPtr)
     // Legend entries are stored in bottom-to-top
     if (nn < nEntries_) {
       int count = 0;
-      for (Blt_ChainLink link = Chain_FirstLink(graphPtr_->elements_.displayList); link; link = Blt_Chain_NextLink(link)) {
-	Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+      for (Blt_ChainLink link = Chain_FirstLink(graphPtr_->elements_.displayList); link; link = Chain_NextLink(link)) {
+	Element* elemPtr = (Element*)Chain_GetValue(link);
 	ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 	if (elemOps->label) {
 	  if (count == nn) {
@@ -1021,16 +1021,16 @@ static int SelectionProc(ClientData clientData, int offset, char *buffer,
   Tcl_DStringInit(&dString);
   if (legendPtr->flags & SELECT_SORTED) {
     for (Blt_ChainLink link=Chain_FirstLink(legendPtr->selected_); 
-	 link; link = Blt_Chain_NextLink(link)) {
-      Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      Element* elemPtr = (Element*)Chain_GetValue(link);
       Tcl_DStringAppend(&dString, elemPtr->name_, -1);
       Tcl_DStringAppend(&dString, "\n", -1);
     }
   }
   else {
     for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList);
-	 link; link = Blt_Chain_NextLink(link)) {
-      Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      Element* elemPtr = (Element*)Chain_GetValue(link);
       if (legendPtr->entryIsSelected(elemPtr)) {
 	Tcl_DStringAppend(&dString, elemPtr->name_, -1);
 	Tcl_DStringAppend(&dString, "\n", -1);
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index d226fdf..30e0999 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -138,8 +138,8 @@ static int ActivateOp(ClientData clientData, Tcl_Interp* interp,
   for (int ii=3; ii<objc; ii++) {
     
     const char* pattern = Tcl_GetString(objv[ii]);
-    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Blt_Chain_NextLink(link)) {
-      Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
+      Element* elemPtr = (Element*)Chain_GetValue(link);
       if (Tcl_StringMatch(elemPtr->name_, pattern)) {
 	if (active) {
 	  if (!elemPtr->labelActive_) {
@@ -164,8 +164,8 @@ static int ActivateOp(ClientData clientData, Tcl_Interp* interp,
 
   // List active elements in stacking order
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
-  for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+  for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     if (elemPtr->labelActive_) {
       Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name_, -1);
       Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
@@ -207,17 +207,17 @@ static int CurselectionOp(ClientData clientData, Tcl_Interp* interp,
   if (legendPtr->flags & SELECT_SORTED) {
     Blt_ChainLink link;
 
-    for (link = Chain_FirstLink(legendPtr->selected_); link != NULL;
-	 link = Blt_Chain_NextLink(link)) {
-      Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    for (link = Chain_FirstLink(legendPtr->selected_); link;
+	 link = Chain_NextLink(link)) {
+      Element* elemPtr = (Element*)Chain_GetValue(link);
       Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name_, -1);
       Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
   }
   else {
     // List of selected entries is in stacking order
-    for (Blt_ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
-      Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    for (Blt_ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
+      Element* elemPtr = (Element*)Chain_GetValue(link);
 
       if (legendPtr->entryIsSelected(elemPtr)) {
 	Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name_, -1);
@@ -364,10 +364,9 @@ static int SelectionMarkOp(ClientData clientData, Tcl_Interp* interp,
   if (legendPtr->selMarkPtr_ != elemPtr) {
     // Deselect entry from the list all the way back to the anchor
     Blt_ChainLink link, next;
-    for (link = Chain_LastLink(legendPtr->selected_); link != NULL; 
-	 link = next) {
+    for (link = Chain_LastLink(legendPtr->selected_); link; link = next) {
       next = Chain_PrevLink(link);
-      Element *selectPtr = (Element*)Blt_Chain_GetValue(link);
+      Element *selectPtr = (Element*)Chain_GetValue(link);
       if (selectPtr == legendPtr->selAnchorPtr_)
 	break;
 
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index 6856115..e0c5462 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -322,8 +322,8 @@ static int FindOp(ClientData clientData, Tcl_Interp* interp,
 
   int enclosed = (mode == FIND_ENCLOSED);
   for (Blt_ChainLink link = Chain_FirstLink(graphPtr->markers_.displayList);
-       link; link = Blt_Chain_NextLink(link)) {
-    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* ops = (MarkerOptions*)markerPtr->ops();
     if (ops->hide)
       continue;
@@ -349,16 +349,16 @@ static int NamesOp(ClientData clientData, Tcl_Interp* interp,
   Tcl_Obj* listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
   if (objc == 3) {
     for (Blt_ChainLink link=Chain_FirstLink(graphPtr->markers_.displayList); 
-	 link; link = Blt_Chain_NextLink(link)) {
-      Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      Marker* markerPtr = (Marker*)Chain_GetValue(link);
       Tcl_ListObjAppendElement(interp, listObjPtr,
 			       Tcl_NewStringObj(markerPtr->name_, -1));
     }
   } 
   else {
     for (Blt_ChainLink link=Chain_FirstLink(graphPtr->markers_.displayList); 
-	 link; link = Blt_Chain_NextLink(link)) {
-      Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      Marker* markerPtr = (Marker*)Chain_GetValue(link);
       for (int ii = 3; ii<objc; ii++) {
 	const char* pattern = (const char*)Tcl_GetString(objv[ii]);
 	if (Tcl_StringMatch(markerPtr->name_, pattern)) {
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index c5165b7..c440ec7 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -56,7 +56,7 @@ static Axis* GetAxisFromCmd(ClientData clientData, Tcl_Obj* obj)
     return NULL;
 
   Blt_ChainLink link = Chain_FirstLink(ops->margins[margin].axes);
-  return (Axis*)Blt_Chain_GetValue(link);
+  return (Axis*)Chain_GetValue(link);
 }
 
 static int CgetOp(ClientData clientData, Tcl_Interp* interp,
@@ -142,8 +142,8 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
   if (objc == 3) {
     Tcl_Obj* listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
     for (Blt_ChainLink link = Chain_FirstLink(chain); link;
-	 link = Blt_Chain_NextLink(link)) {
-      Axis* axisPtr = (Axis*)Blt_Chain_GetValue(link);
+	 link = Chain_NextLink(link)) {
+      Axis* axisPtr = (Axis*)Chain_GetValue(link);
       Tcl_ListObjAppendElement(interp, listObjPtr,
 			       Tcl_NewStringObj(axisPtr->name_, -1));
     }
@@ -157,10 +157,10 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
     return TCL_ERROR;
 
   for (Blt_ChainLink link = Chain_FirstLink(chain); link; 
-       link = Blt_Chain_NextLink(link)) {
+       link = Chain_NextLink(link)) {
     Axis* axisPtr;
 
-    axisPtr = (Axis*)Blt_Chain_GetValue(link);
+    axisPtr = (Axis*)Chain_GetValue(link);
     axisPtr->link = NULL;
     axisPtr->use_ =0;
     // Clear the axis type if it's not currently used
@@ -185,7 +185,7 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
     if (axisPtr->link) {
       /* Move the axis from the old margin's "use" list to the new. */
       Chain_UnlinkLink(axisPtr->chain, axisPtr->link);
-      Blt_Chain_AppendLink(chain, axisPtr->link);
+      Chain_AppendLink(chain, axisPtr->link);
     }
     else
       axisPtr->link = Chain_Append(chain, axisPtr);
diff --git a/src/bltGraph.C b/src/bltGraph.C
index b0cebf8..551fd97 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -662,8 +662,8 @@ void Graph::destroyElements()
 void Graph::configureElements()
 {
   for (Blt_ChainLink link=Chain_FirstLink(elements_.displayList); 
-       link; link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->configure();
   }
 }
@@ -671,8 +671,8 @@ void Graph::configureElements()
 void Graph::mapElements()
 {
   for (Blt_ChainLink link =Chain_FirstLink(elements_.displayList); 
-       link; link = Blt_Chain_NextLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->map();
   }
 }
@@ -682,7 +682,7 @@ void Graph::drawElements(Drawable drawable)
   // Draw with respect to the stacking order
   for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
        link; link = Chain_PrevLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->draw(drawable);
   }
 }
@@ -691,7 +691,7 @@ void Graph::drawActiveElements(Drawable drawable)
 {
   for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
        link; link = Chain_PrevLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->drawActive(drawable);
   }
 }
@@ -700,7 +700,7 @@ void Graph::printElements(PSOutput* psPtr)
 {
   for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
        link != NULL; link = Chain_PrevLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->print(psPtr);
   }
 }
@@ -709,7 +709,7 @@ void Graph::printActiveElements(PSOutput* psPtr)
 {
   for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
        link; link = Chain_PrevLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->printActive(psPtr);
   }
 }
@@ -759,8 +759,8 @@ void Graph::destroyMarkers()
 void Graph::configureMarkers()
 {
   for (Blt_ChainLink link = Chain_FirstLink(markers_.displayList); 
-       link; link = Blt_Chain_NextLink(link)) {
-    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Marker* markerPtr = (Marker*)Chain_GetValue(link);
     markerPtr->configure();
   }
 }
@@ -768,8 +768,8 @@ void Graph::configureMarkers()
 void Graph::mapMarkers()
 {
   for (Blt_ChainLink link = Chain_FirstLink(markers_.displayList); 
-       link; link = Blt_Chain_NextLink(link)) {
-    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
 
     if (mops->hide)
@@ -788,7 +788,7 @@ void Graph::drawMarkers(Drawable drawable, int under)
 {
   for (Blt_ChainLink link = Chain_LastLink(markers_.displayList); 
        link; link = Chain_PrevLink(link)) {
-    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
+    Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
 
     if ((mops->drawUnder != under) || markerPtr->clipped_ || mops->hide)
@@ -805,7 +805,7 @@ void Graph::printMarkers(PSOutput* psPtr, int under)
 {
   for (Blt_ChainLink link = Chain_LastLink(markers_.displayList); 
        link; link = Chain_PrevLink(link)) {
-    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
+    Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
     if (mops->drawUnder != under)
       continue;
@@ -835,8 +835,8 @@ Marker* Graph::nearestMarker(int x, int y, int under)
   point.x = (double)x;
   point.y = (double)y;
   for (Blt_ChainLink link = Chain_FirstLink(markers_.displayList);
-       link; link = Blt_Chain_NextLink(link)) {
-    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
 
     if ((markerPtr->flags & MAP_ITEM) || mops->hide)
@@ -975,8 +975,8 @@ void Graph::mapAxes()
 
     Blt_Chain chain = ops->margins[ii].axes;
     for (Blt_ChainLink link=Chain_FirstLink(chain); link; 
-	 link = Blt_Chain_NextLink(link)) {
-      Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
+	 link = Chain_NextLink(link)) {
+      Axis *axisPtr = (Axis*)Chain_GetValue(link);
       AxisOptions* aops = (AxisOptions*)axisPtr->ops();
       if (!axisPtr->use_)
 	continue;
@@ -1004,8 +1004,8 @@ void Graph::drawAxes(Drawable drawable)
 
   for (int ii=0; ii<4; ii++) {
     for (Blt_ChainLink link = Chain_LastLink(ops->margins[ii].axes); 
-	 link != NULL; link = Chain_PrevLink(link)) {
-      Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
+	 link; link = Chain_PrevLink(link)) {
+      Axis *axisPtr = (Axis*)Chain_GetValue(link);
       axisPtr->draw(drawable);
     }
   }
@@ -1027,8 +1027,8 @@ void Graph::drawAxesGrids(Drawable drawable)
 
   for (int ii=0; ii<4; ii++) {
     for (Blt_ChainLink link = Chain_FirstLink(ops->margins[ii].axes);
-	 link; link = Blt_Chain_NextLink(link)) {
-      Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      Axis *axisPtr = (Axis*)Chain_GetValue(link);
       axisPtr->drawGrids(drawable);
     }
   }
@@ -1041,8 +1041,8 @@ void Graph::printAxes(PSOutput* psPtr)
   Margin *mp, *mend;
   for (mp = ops->margins, mend = mp + 4; mp < mend; mp++) {
     for (Blt_ChainLink link=Chain_FirstLink(mp->axes); link; 
-	 link = Blt_Chain_NextLink(link)) {
-      Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
+	 link = Chain_NextLink(link)) {
+      Axis *axisPtr = (Axis*)Chain_GetValue(link);
       axisPtr->print(psPtr);
     }
   }
@@ -1054,8 +1054,8 @@ void Graph::printAxesGrids(PSOutput* psPtr)
 
   for (int ii=0; ii<4; ii++) {
     for (Blt_ChainLink link=Chain_FirstLink(ops->margins[ii].axes);
-	 link; link = Blt_Chain_NextLink(link)) {
-      Axis *axisPtr = (Axis*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      Axis *axisPtr = (Axis*)Chain_GetValue(link);
       axisPtr->printGrids(psPtr);
     }
   }
@@ -1163,10 +1163,10 @@ void Graph::resetAxes()
   // will be the axis limits if the user doesn't override them 
   // with -min and -max options.
   for (Blt_ChainLink link = Chain_FirstLink(elements_.displayList);
-       link; link = Blt_Chain_NextLink(link)) {
+       link; link = Chain_NextLink(link)) {
     Region2d exts;
 
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemops = (ElementOptions*)elemPtr->ops();
     elemPtr->extents(&exts);
     elemops->xAxis->getDataLimits(exts.left, exts.right);
@@ -1208,8 +1208,8 @@ Axis* Graph::nearestAxis(int x, int y)
 
     if (ops->showTicks) {
       for (Blt_ChainLink link=Chain_FirstLink(axisPtr->tickLabels_);
-	   link; link = Blt_Chain_NextLink(link)) {	
-	TickLabel *labelPtr = (TickLabel*)Blt_Chain_GetValue(link);
+	   link; link = Chain_NextLink(link)) {	
+	TickLabel *labelPtr = (TickLabel*)Chain_GetValue(link);
 	double rw, rh;
 	Point2d bbox[5];
 	getBoundingBox(labelPtr->width, labelPtr->height, ops->tickAngle,
@@ -1372,7 +1372,7 @@ ClientData Graph::pickEntry(int xx, int yy, ClassId* classIdPtr)
 	
   for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); link;
        link = Chain_PrevLink(link)) {
-    Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
+    Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* eops = (ElementOptions*)elemPtr->ops();
     if (eops->hide)
       continue;
diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C
index b4cbabc..7fb7216 100644
--- a/src/bltGraphBar.C
+++ b/src/bltGraphBar.C
@@ -326,8 +326,8 @@ void BarGraph::initBarSets()
   int nSegs =0;
 
   for (Blt_ChainLink link = Chain_FirstLink(elements_.displayList);
-       link; link = Blt_Chain_NextLink(link)) {
-    BarElement* bePtr = (BarElement*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    BarElement* bePtr = (BarElement*)Chain_GetValue(link);
     BarElementOptions* ops = (BarElementOptions*)bePtr->ops();
     if (ops->hide)
       continue;
@@ -463,8 +463,8 @@ void BarGraph::computeBarStacks()
   // abscissas
 
   for (link = Chain_FirstLink(elements_.displayList); 
-       link; link = Blt_Chain_NextLink(link)) {
-    BarElement* bePtr = (BarElement*)Blt_Chain_GetValue(link);
+       link; link = Chain_NextLink(link)) {
+    BarElement* bePtr = (BarElement*)Chain_GetValue(link);
     BarElementOptions* ops = (BarElementOptions*)bePtr->ops();
     if (ops->hide)
       continue;
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index 2504368..bef0f45 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -332,7 +332,7 @@ static Axis* GetFirstAxis(Blt_Chain chain)
   if (!link)
     return NULL;
 
-  return (Axis*)Blt_Chain_GetValue(link);
+  return (Axis*)Chain_GetValue(link);
 }
 
 // Tk Interface
diff --git a/src/bltGraphSup.C b/src/bltGraphSup.C
index 6c713cd..46f9012 100644
--- a/src/bltGraphSup.C
+++ b/src/bltGraphSup.C
@@ -396,8 +396,8 @@ int Graph::getMarginGeometry(Margin *marginPtr)
 
   if (ops->stackAxes) {
     for (Blt_ChainLink link = Chain_FirstLink(marginPtr->axes);
-	 link != NULL; link = Blt_Chain_NextLink(link)) {
-      Axis* axisPtr = (Axis*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      Axis* axisPtr = (Axis*)Chain_GetValue(link);
       AxisOptions* ops = (AxisOptions*)axisPtr->ops();
       if (!ops->hide && axisPtr->use_) {
 	nVisible++;
@@ -421,8 +421,8 @@ int Graph::getMarginGeometry(Margin *marginPtr)
   }
   else {
     for (Blt_ChainLink link = Chain_FirstLink(marginPtr->axes);
-	 link != NULL; link = Blt_Chain_NextLink(link)) {
-      Axis* axisPtr = (Axis*)Blt_Chain_GetValue(link);
+	 link; link = Chain_NextLink(link)) {
+      Axis* axisPtr = (Axis*)Chain_GetValue(link);
       AxisOptions* ops = (AxisOptions*)axisPtr->ops();
       if (!ops->hide && axisPtr->use_) {
 	nVisible++;
diff --git a/src/bltVector.C b/src/bltVector.C
index 1ba29b2..96f6ba9 100644
--- a/src/bltVector.C
+++ b/src/bltVector.C
@@ -378,9 +378,9 @@ void Blt_Vec_NotifyClients(ClientData clientData)
   notify = (vPtr->notifyFlags & NOTIFY_DESTROYED)
     ? BLT_VECTOR_NOTIFY_DESTROY : BLT_VECTOR_NOTIFY_UPDATE;
   vPtr->notifyFlags &= ~(NOTIFY_UPDATED | NOTIFY_DESTROYED | NOTIFY_PENDING);
-  for (link = Chain_FirstLink(vPtr->chain); link != NULL; link = next) {
+  for (link = Chain_FirstLink(vPtr->chain); link; link = next) {
     next = Chain_NextLink(link);
-    VectorClient *clientPtr = (VectorClient*)Blt_Chain_GetValue(link);
+    VectorClient *clientPtr = (VectorClient*)Chain_GetValue(link);
     if ((clientPtr->proc != NULL) && (clientPtr->serverPtr != NULL)) {
       (*clientPtr->proc) (vPtr->interp, clientPtr->clientData, notify);
     }
@@ -390,9 +390,8 @@ void Blt_Vec_NotifyClients(ClientData clientData)
   // should call Blt_FreeVectorId to release the client identifier), so mark
   // any remaining clients to indicate that vector's server has gone away.
   if (notify == BLT_VECTOR_NOTIFY_DESTROY) {
-    for (link = Chain_FirstLink(vPtr->chain); link != NULL;
-	 link = Chain_NextLink(link)) {
-      VectorClient *clientPtr = (VectorClient*)Blt_Chain_GetValue(link);
+    for (link=Chain_FirstLink(vPtr->chain); link; link=Chain_NextLink(link)) {
+      VectorClient *clientPtr = (VectorClient*)Chain_GetValue(link);
       clientPtr->serverPtr = NULL;
     }
   }
@@ -791,9 +790,8 @@ void Blt::Vec_Free(Vector* vPtr)
   vPtr->notifyFlags |= NOTIFY_DESTROYED;
   Blt_Vec_NotifyClients(vPtr);
 
-  for (link = Chain_FirstLink(vPtr->chain); link != NULL;
-       link = Chain_NextLink(link)) {
-    VectorClient *clientPtr = (VectorClient*)Blt_Chain_GetValue(link);
+  for (link=Chain_FirstLink(vPtr->chain); link; link=Chain_NextLink(link)) {
+    VectorClient *clientPtr = (VectorClient*)Chain_GetValue(link);
     free(clientPtr);
   }
   Chain_Destroy(vPtr->chain);