a bit more refactoring

src/compiler/GF/Grammar/Binary.hs

@@ -28,17 +28,6 @@ import PGF2.Transactions(Symbol(..))
 -- Please change this every time when the GFO format is changed
 gfoVersion = "GF05"
 
-instance Binary Ident where
-  put id = put (ident2utf8 id)
-  get    = do bs <- get
-              if bs == BS.pack "_"
-                then return identW
-                else return (identC (rawIdentC bs))
-
-instance Binary ModuleName where
-  put (MN id) = put id
-  get = fmap MN get
-
 instance Binary Grammar where
   put = put . modules
   get = fmap mGrammar get

src/compiler/GF/Grammar/Parser.y

@@ -727,7 +727,7 @@ listCatDef (L loc (id,cont,size)) = [catd,nilfund,consfund]
     niltyp  = mkProdSimple (cont' ++ replicate size cd) lc
     constyp = mkProdSimple (cont' ++ [cd, mkHypo lc]) lc
 
-    mkId x i = if isWildIdent x then (varX i) else x
+    mkId x i = if x == identW then (varX i) else x
 
 tryLoc (c,mty,Just e) = return (c,(mty,e))
 tryLoc (c,_  ,_     ) = fail ("local definition of" +++ showIdent c +++ "without value")