diff --git a/src/GF/Compile.hs b/src/GF/Compile.hs
index ed2481835..d4b3a9df3 100644
--- a/src/GF/Compile.hs
+++ b/src/GF/Compile.hs
@@ -41,7 +41,9 @@ import qualified Data.Set as Set
 import Data.List(nub)
 
 import PGF.Check
+import PGF.CId
 import PGF.Data
+import PGF.Macros
 
 
 -- | Compiles a number of source files and builds a 'PGF' structure for them.
diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs
index 51a99e632..3b71bf28a 100644
--- a/src/GF/Compile/GrammarToGFCC.hs
+++ b/src/GF/Compile/GrammarToGFCC.hs
@@ -51,7 +51,7 @@ mkCanon2gfcc opts cnc gr =
 
 -- Adds parsers for all concretes
 addParsers :: Options -> D.PGF -> D.PGF
-addParsers opts pgf = pgf { D.concretes = Map.map conv (D.concretes pgf) }
+addParsers opts pgf = CM.mapConcretes conv pgf
   where
     conv cnc = cnc { D.parser = Just pinfo }
       where
diff --git a/src/GF/Compile/OptimizeGFCC.hs b/src/GF/Compile/OptimizeGFCC.hs
index c73d5bbcb..2a218e1bb 100644
--- a/src/GF/Compile/OptimizeGFCC.hs
+++ b/src/GF/Compile/OptimizeGFCC.hs
@@ -2,6 +2,7 @@ module GF.Compile.OptimizeGFCC where
 
 import PGF.CId
 import PGF.Data
+import PGF.Macros
 
 import GF.Data.Operations
 
@@ -16,9 +17,7 @@ optPGF :: PGF -> PGF
 optPGF = cseOptimize . suffixOptimize
 
 suffixOptimize :: PGF -> PGF
-suffixOptimize pgf = pgf {
-  concretes = Map.map opt (concretes pgf)
-  }
+suffixOptimize = mapConcretes opt
  where 
   opt cnc = cnc {
     lins = Map.map optTerm (lins cnc),
@@ -27,9 +26,7 @@ suffixOptimize pgf = pgf {
   }
 
 cseOptimize :: PGF -> PGF
-cseOptimize pgf = pgf {
-  concretes = Map.map subex (concretes pgf)
-  }
+cseOptimize = mapConcretes subex
 
 -- analyse word form lists into prefix + suffixes
 -- suffix sets can later be shared by subex elim
diff --git a/src/PGF/Macros.hs b/src/PGF/Macros.hs
index d8e203727..22b96df92 100644
--- a/src/PGF/Macros.hs
+++ b/src/PGF/Macros.hs
@@ -10,6 +10,9 @@ import Data.List
 
 -- operations for manipulating PGF grammars and objects
 
+mapConcretes :: (Concr -> Concr) -> PGF -> PGF
+mapConcretes f pgf = pgf { concretes = Map.map f (concretes pgf) }
+
 lookLin :: PGF -> CId -> CId -> Term
 lookLin pgf lang fun = 
   lookMap tm0 fun $ lins $ lookMap (error "no lang") lang $ concretes pgf