Index: trunk/psModules/src/concepts/pmConceptsStandard.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 9539)
+++ trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 9572)
@@ -30,5 +30,5 @@
 
 
-static double defaultCoordScaling(psMetadataItem *pattern)
+static double defaultCoordScaling(const psMetadataItem *pattern)
 {
     if (strcmp(pattern->name, "FPA.RA") == 0) {
@@ -46,10 +46,10 @@
 
 // FPA.RA and FPA.DEC
-psMetadataItem *p_pmConceptParse_FPA_Coords(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptParse_FPA_Coords(const psMetadataItem *concept,
+        const psMetadataItem *pattern,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -115,9 +115,9 @@
 
 // FPA.RA and FPA.DEC
-psMetadataItem *p_pmConceptFormat_FPA_Coords(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptFormat_FPA_Coords(const psMetadataItem *concept,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -165,10 +165,10 @@
 
 
-psMetadataItem *p_pmConceptParse_CELL_TRIMSEC(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptParse_CELL_TRIMSEC(const psMetadataItem *concept,
+        const psMetadataItem *pattern,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -189,10 +189,10 @@
 }
 
-psMetadataItem *p_pmConceptParse_CELL_BIASSEC(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptParse_CELL_BIASSEC(const psMetadataItem *concept,
+        const psMetadataItem *pattern,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -245,10 +245,10 @@
 
 // CELL.XBIN and CELL.YBIN
-psMetadataItem *p_pmConceptParse_CELL_Binning(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptParse_CELL_Binning(const psMetadataItem *concept,
+        const psMetadataItem *pattern,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -282,10 +282,10 @@
 
 
-psMetadataItem *p_pmConceptParse_TIMESYS(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptParse_TIMESYS(const psMetadataItem *concept,
+        const psMetadataItem *pattern,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -311,10 +311,10 @@
 }
 
-psMetadataItem *p_pmConceptParse_TIME(psMetadataItem *concept,
-                                      psMetadataItem *pattern,
-                                      psMetadata *cameraFormat,
-                                      pmFPA *fpa,
-                                      pmChip *chip,
-                                      pmCell *cell)
+psMetadataItem *p_pmConceptParse_TIME(const psMetadataItem *concept,
+                                      const psMetadataItem *pattern,
+                                      const psMetadata *cameraFormat,
+                                      const pmFPA *fpa,
+                                      const pmChip *chip,
+                                      const pmCell *cell)
 {
     assert(concept);
@@ -523,5 +523,5 @@
 
 // Correct a position --- in case the user wants FORTRAN indexing (like the FITS standard...)
-static int fortranCorr(psMetadata *cameraFormat, // The camera format description
+static int fortranCorr(const psMetadata *cameraFormat, // The camera format description
                        const char *name // Name of concept to check for FORTRAN indexing
                       )
@@ -538,10 +538,10 @@
 }
 
-psMetadataItem *p_pmConceptParse_Positions(psMetadataItem *concept,
-        psMetadataItem *pattern,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptParse_Positions(const psMetadataItem *concept,
+        const psMetadataItem *pattern,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -572,9 +572,9 @@
 
 
-psMetadataItem *p_pmConceptFormat_CELL_TRIMSEC(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptFormat_CELL_TRIMSEC(const psMetadataItem *concept,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -588,9 +588,9 @@
 }
 
-psMetadataItem *p_pmConceptFormat_CELL_BIASSEC(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptFormat_CELL_BIASSEC(const psMetadataItem *concept,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     // Return a metadata item containing a list of metadata items of region strings
@@ -614,9 +614,9 @@
 // This function actually does both CELL.XBIN and CELL.YBIN if CELL.XBIN and CELL.YBIN are specified by the
 // same header.
-psMetadataItem *p_pmConceptFormat_CELL_XBIN(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptFormat_CELL_XBIN(const psMetadataItem *concept,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -637,13 +637,13 @@
 
     // Otherwise, there's no formatting required
-    return psMemIncrRefCounter(concept);
+    return psMetadataItemCopy(concept);
 }
 
 // Only need to format if both if CELL.XBIN and CELL.YBIN are not specified by the same header.
-psMetadataItem *p_pmConceptFormat_CELL_YBIN(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptFormat_CELL_YBIN(const psMetadataItem *concept,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);
@@ -660,13 +660,13 @@
 
     // No formatting required
-    return psMemIncrRefCounter(concept);
-}
-
-
-psMetadataItem *p_pmConceptFormat_TIMESYS(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+    return psMetadataItemCopy(concept);
+}
+
+
+psMetadataItem *p_pmConceptFormat_TIMESYS(const psMetadataItem *concept,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     psString sys = NULL;            // String to store
@@ -693,9 +693,9 @@
 }
 
-psMetadataItem *p_pmConceptFormat_TIME(psMetadataItem *concept,
-                                       psMetadata *cameraFormat,
-                                       pmFPA *fpa,
-                                       pmChip *chip,
-                                       pmCell *cell)
+psMetadataItem *p_pmConceptFormat_TIME(const psMetadataItem *concept,
+                                       const psMetadata *cameraFormat,
+                                       const pmFPA *fpa,
+                                       const pmChip *chip,
+                                       const pmCell *cell)
 {
     psTime *time = concept->data.V;     // The time
@@ -808,9 +808,9 @@
 }
 
-psMetadataItem *p_pmConceptFormat_Positions(psMetadataItem *concept,
-        psMetadata *cameraFormat,
-        pmFPA *fpa,
-        pmChip *chip,
-        pmCell *cell)
+psMetadataItem *p_pmConceptFormat_Positions(const psMetadataItem *concept,
+        const psMetadata *cameraFormat,
+        const pmFPA *fpa,
+        const pmChip *chip,
+        const pmCell *cell)
 {
     assert(concept);