Index: trunk/psModules/src/imcombine/pmPSFEnvelope.c
===================================================================
--- trunk/psModules/src/imcombine/pmPSFEnvelope.c	(revision 25486)
+++ trunk/psModules/src/imcombine/pmPSFEnvelope.c	(revision 25487)
@@ -128,18 +128,17 @@
             float x = numCols / 2.0, y = numRows / 2.0; // Coordinates of interest
             for (int j = 4; j < psf->params->n; j++) {
-                double val = pmTrend2DEval(psf->params->data[j], x, y);
+                pmTrend2D *trend = psf->params->data[j]; // Trend of interest
+                double val = pmTrend2DEval(trend, x, y);
                 double err;
-                switch (psf->psfTrendMode) {
+                switch (trend->mode) {
                   case PM_TREND_POLY_ORD:
                   case PM_TREND_POLY_CHEB:
                     err = NAN;
                     break;
-                  case PM_TREND_MAP: {
-                      pmTrend2D *trend = psf->params->data[j];
-                      err = psImageUnbinPixel(x, y, trend->map->error, trend->map->binning);
-                      break;
-                  }
+                  case PM_TREND_MAP:
+                    err = psImageUnbinPixel(x, y, trend->map->error, trend->map->binning);
+                    break;
                   default:
-                    psAbort("Unsupported mode: %x", psf->psfTrendMode);
+                    psAbort("Unsupported mode: %x", trend->mode);
                 }
                 psStringAppend(&string, "%lf %lf   ", val, err);