1 files changed, 7 insertions, 9 deletions
diff --git a/src/AST/Pretty.hs b/src/AST/Pretty.hs
index 2c51b85..bbcfd9e 100644
--- a/src/AST/Pretty.hs
+++ b/src/AST/Pretty.hs
@@ -206,21 +206,20 @@ ppExpr' d val expr = case expr of
 
   EMap _ a b -> do
     let STArr _ t1 = typeOf b
-    name <- genNameIfUsedIn' "i" t1 IZ a
+    name <- genNameIfUsedIn t1 IZ a
     a' <- ppExpr' 0 (Const name `SCons` val) a
     b' <- ppExpr' 11 val b
     return $ ppParen (d > 0) $
       ppApp (annotate AHighlight (ppString "map") <> ppX expr) [ppLam [ppString name] a', b']
 
   EFold1Inner _ cm a b c -> do
-    name1 <- genNameIfUsedIn (typeOf a) (IS IZ) a
-    name2 <- genNameIfUsedIn (typeOf a) IZ a
-    a' <- ppExpr' 0 (Const name2 `SCons` Const name1 `SCons` val) a
+    name <- genNameIfUsedIn (STPair (typeOf a) (typeOf a)) IZ a
+    a' <- ppExpr' 0 (Const name `SCons` val) a
     b' <- ppExpr' 11 val b
     c' <- ppExpr' 11 val c
     let opname = "fold1i" ++ ppCommut cm
     return $ ppParen (d > 10) $
-      ppApp (annotate AHighlight (ppString opname) <> ppX expr) [ppLam [ppString name1, ppString name2] a', b', c']
+      ppApp (annotate AHighlight (ppString opname) <> ppX expr) [ppLam [ppString name] a', b', c']
 
   ESum1Inner _ e -> do
     e' <- ppExpr' 11 val e
@@ -254,14 +253,13 @@ ppExpr' d val expr = case expr of
     return $ ppParen (d > 10) $ ppApp (ppString "zip" <> ppX expr) [e1', e2']
 
   EFold1InnerD1 _ cm a b c -> do
-    name1 <- genNameIfUsedIn (typeOf b) (IS IZ) a
-    name2 <- genNameIfUsedIn (typeOf b) IZ a
-    a' <- ppExpr' 0 (Const name2 `SCons` Const name1 `SCons` val) a
+    name <- genNameIfUsedIn (STPair (typeOf b) (typeOf b)) IZ a
+    a' <- ppExpr' 0 (Const name `SCons` val) a
     b' <- ppExpr' 11 val b
     c' <- ppExpr' 11 val c
     let opname = "fold1iD1" ++ ppCommut cm
     return $ ppParen (d > 10) $
-      ppApp (annotate AHighlight (ppString opname) <> ppX expr) [ppLam [ppString name1, ppString name2] a', b', c']
+      ppApp (annotate AHighlight (ppString opname) <> ppX expr) [ppLam [ppString name] a', b', c']
 
   EFold1InnerD2 _ cm ef ebog ed -> do
     let STArr _ tB = typeOf ebog