sync with laptop version, irrelevant changes

lib/resource-1.4/french/MorphoFre.gf

@@ -11,7 +11,7 @@
 resource MorphoFre = CommonRomance, ResFre ** 
   open PhonoFre, Prelude, Predef in {
 
-flags optimize=all ;
+flags optimize=noexpand ;
 
 --2 Front vowels
 --

src-3.0/GF/Compile/Compute.hs

@@ -330,10 +330,10 @@ computeTermOpt rec gr = comput True where
 ----           return $ V ty (map snd cs')
            return $ T i cs'
          V ty cs -> do
-          -- if there are no variables, don't even go inside
-          cs' <- if (null g) then return cs else mapM (comp g) cs
-----       return $ V ty (map snd cs')
-          return $ V ty cs'
+           ty' <- comp g ty
+           -- if there are no variables, don't even go inside
+           cs' <- if (null g) then return cs else mapM (comp g) cs
+           return $ V ty' cs'
 
          T i cs -> do
            pty0 <- getTableType i