Demand: Format Call SubDemands `Cn(sd)` as `C(n,sd)` (#22231)wip/T22231

Justification in #22231. Short form: In a demand like `1C1(C1(L))`
it was too easy to confuse which `1` belongs to which `C`. Now
that should be more obvious.

Fixes #22231

17 files changed, 52 insertions, 52 deletions

diff --git a/testsuite/tests/stranal/should_compile/T18894.stderr b/testsuite/tests/stranal/should_compile/T18894.stderr
index 93cb812444..22c6f3b32d 100644
--- a/testsuite/tests/stranal/should_compile/T18894.stderr
+++ b/testsuite/tests/stranal/should_compile/T18894.stderr
@@ -46,7 +46,7 @@ lvl :: Int
 lvl = GHC.Types.I# 0#
 
 -- RHS size: {terms: 42, types: 15, coercions: 0, joins: 0/1}
-g2 [InlPrag=NOINLINE, Dmd=LCS(C1(!P(M!P(L),1!P(L))))]
+g2 [InlPrag=NOINLINE, Dmd=LC(S,C(1,!P(M!P(L),1!P(L))))]
   :: Int -> Int -> (Int, Int)
 [LclId,
  Arity=2,
@@ -147,7 +147,7 @@ lvl :: (Int, Int)
 lvl = (lvl, lvl)
 
 -- RHS size: {terms: 36, types: 10, coercions: 0, joins: 0/1}
-g1 [InlPrag=NOINLINE, Dmd=LCL(!P(L,L))] :: Int -> (Int, Int)
+g1 [InlPrag=NOINLINE, Dmd=LC(L,!P(L,L))] :: Int -> (Int, Int)
 [LclId,
  Arity=1,
  Str=<1!P(1L)>,
@@ -264,7 +264,7 @@ lvl :: Int
 lvl = GHC.Types.I# 0#
 
 -- RHS size: {terms: 39, types: 17, coercions: 0, joins: 0/1}
-$wg2 [InlPrag=NOINLINE, Dmd=LCS(C1(!P(M!P(L),1!P(L))))]
+$wg2 [InlPrag=NOINLINE, Dmd=LC(S,C(1,!P(M!P(L),1!P(L))))]
   :: Int -> GHC.Prim.Int# -> (# Int, Int #)
 [LclId[StrictWorker([])],
  Arity=2,
@@ -328,7 +328,7 @@ h2
       }
 
 -- RHS size: {terms: 34, types: 14, coercions: 0, joins: 0/1}
-$wg1 [InlPrag=NOINLINE, Dmd=LCL(!P(L,L))]
+$wg1 [InlPrag=NOINLINE, Dmd=LC(L,!P(L,L))]
   :: GHC.Prim.Int# -> (# GHC.Prim.Int#, Int #)
 [LclId[StrictWorker([])],
  Arity=1,
@@ -366,7 +366,7 @@ lvl :: (Int, Int)
 lvl = case $wg1 2# of { (# ww, ww #) -> (GHC.Types.I# ww, ww) }
 
 -- RHS size: {terms: 22, types: 16, coercions: 0, joins: 0/0}
-$wh1 [InlPrag=[2], Dmd=LCS(!P(L))] :: GHC.Prim.Int# -> Int
+$wh1 [InlPrag=[2], Dmd=LC(S,!P(L))] :: GHC.Prim.Int# -> Int
 [LclId[StrictWorker([])],
  Arity=1,
  Str=<1L>,
diff --git a/testsuite/tests/stranal/should_compile/T18894b.stderr b/testsuite/tests/stranal/should_compile/T18894b.stderr
index d9d950769b..aee02bf18c 100644
--- a/testsuite/tests/stranal/should_compile/T18894b.stderr
+++ b/testsuite/tests/stranal/should_compile/T18894b.stderr
@@ -38,7 +38,7 @@ expensive
       (case n of { GHC.Types.I# x -> GHC.Types.I# (GHC.Prim.+# x 1#) }, case n of { GHC.Types.I# x -> GHC.Types.I# (GHC.Prim.+# x 2#) })
 
 -- RHS size: {terms: 20, types: 11, coercions: 0, joins: 0/0}
-eta [InlPrag=NOINLINE, Dmd=UCU(CS(U))] :: Int -> Int -> Int
+eta [InlPrag=NOINLINE, Dmd=UCU(C(S,U))] :: Int -> Int -> Int
 [LclId,
  Arity=1,
  Str=<UP(U)>,
@@ -130,7 +130,7 @@ $wexpensive
          case w of { GHC.Types.I# x -> GHC.Types.I# (GHC.Prim.+# x 2#) } #)
 
 -- RHS size: {terms: 19, types: 12, coercions: 0, joins: 0/0}
-eta [InlPrag=NOINLINE, Dmd=UCU(CS(U))] :: Int -> Int -> Int
+eta [InlPrag=NOINLINE, Dmd=UCU(C(S,U))] :: Int -> Int -> Int
 [LclId,
  Arity=2,
  Str=<MP(U)><SP(U)>,
diff --git a/testsuite/tests/stranal/should_compile/T18903.stderr b/testsuite/tests/stranal/should_compile/T18903.stderr
index 8110312a8b..38298db8c4 100644
--- a/testsuite/tests/stranal/should_compile/T18903.stderr
+++ b/testsuite/tests/stranal/should_compile/T18903.stderr
@@ -56,7 +56,7 @@ h :: Int -> Int
 h = \ (m :: Int) ->
       case m of wild { GHC.Types.I# ds ->
       let {
-        $wg [InlPrag=NOINLINE, Dmd=MC1(!P(M!P(L),1!P(L)))]
+        $wg [InlPrag=NOINLINE, Dmd=MC(1,!P(M!P(L),1!P(L)))]
           :: GHC.Prim.Int# -> (# Int, Int #)
         [LclId, Arity=1, Str=<1L>, Unf=OtherCon []]
         $wg
diff --git a/testsuite/tests/stranal/should_compile/T20817.stderr b/testsuite/tests/stranal/should_compile/T20817.stderr
index c113c3c2d1..eb8e103c8f 100644
--- a/testsuite/tests/stranal/should_compile/T20817.stderr
+++ b/testsuite/tests/stranal/should_compile/T20817.stderr
@@ -234,7 +234,7 @@ Rec {
 -- RHS size: {terms: 34, types: 36, coercions: 0, joins: 0/0}
 $wg [InlPrag=[2],
      Occ=LoopBreaker,
-     Dmd=LCS(C1(C1(C1(C1(C1(C1(L)))))))]
+     Dmd=LC(S,C(1,C(1,C(1,C(1,C(1,C(1,L)))))))]
   :: forall {a} {b} {c} {d} {e} {t} {t} {t}.
      Bool -> a -> b -> c -> t -> t -> t -> (# a, b, c, t, t, t #)
 [LclId[StrictWorker([])],
diff --git a/testsuite/tests/stranal/should_run/T21717b.hs b/testsuite/tests/stranal/should_run/T21717b.hs
index ed61442215..80b3ed0039 100644
--- a/testsuite/tests/stranal/should_run/T21717b.hs
+++ b/testsuite/tests/stranal/should_run/T21717b.hs
@@ -2,7 +2,7 @@ import System.Environment
 import GHC.Exts
 
 g :: (Int -> (Int, Int)) -> Int
--- Should *not* infer strictness SCS(P(SL,SL)) for h
+-- Should *not* infer strictness SC(S,P(SL,SL)) for h
 -- Otherwise `main` could use CbV on the error exprs below
 g h = fst (h 0) + snd (h 1)
 {-# NOINLINE g #-}
diff --git a/testsuite/tests/stranal/should_run/T9254.hs b/testsuite/tests/stranal/should_run/T9254.hs
index 279eb5c1ec..ae1837ba0e 100644
--- a/testsuite/tests/stranal/should_run/T9254.hs
+++ b/testsuite/tests/stranal/should_run/T9254.hs
@@ -5,7 +5,7 @@ import GHC.Exts
 f :: (() -> (# Int#, () #)) -> ()
 {-# NOINLINE f #-}
 -- Strictness signature was (7.8.2)
---    <C(S(LS)), 1*C1(U(A,1*U()))>
+--    <C(S(LS)), 1*C(1,U(A,1*U()))>
 -- I.e. calls k, but discards first component of result
 f k = case k () of (# _, r #) -> r
 
diff --git a/testsuite/tests/stranal/sigs/T16859.stderr b/testsuite/tests/stranal/sigs/T16859.stderr
index afd96a8000..9f7c3c9e5d 100644
--- a/testsuite/tests/stranal/sigs/T16859.stderr
+++ b/testsuite/tests/stranal/sigs/T16859.stderr
@@ -1,7 +1,7 @@
 
 ==================== Strictness signatures ====================
 T16859.bar: <1!A><L>
-T16859.baz: <1L><1!P(L)><1C1(L)>
+T16859.baz: <1L><1!P(L)><1C(1,L)>
 T16859.buz: <1!P(L,L)>
 T16859.foo: <1L><L>
 T16859.mkInternalName: <1!P(L)><1L><1L>
@@ -27,7 +27,7 @@ T16859.n_uniq: 1
 
 ==================== Strictness signatures ====================
 T16859.bar: <1!A><L>
-T16859.baz: <1L><1!P(L)><1C1(L)>
+T16859.baz: <1L><1!P(L)><1C(1,L)>
 T16859.buz: <1!P(L,L)>
 T16859.foo: <1L><L>
 T16859.mkInternalName: <1!P(L)><1L><1L>
diff --git a/testsuite/tests/stranal/sigs/T18957.stderr b/testsuite/tests/stranal/sigs/T18957.stderr
index 04937d4028..94044e754b 100644
--- a/testsuite/tests/stranal/sigs/T18957.stderr
+++ b/testsuite/tests/stranal/sigs/T18957.stderr
@@ -1,9 +1,9 @@
 
 ==================== Strictness signatures ====================
-T18957.g: <MC1(L)><1L>
-T18957.h1: <SCM(L)><1L>
-T18957.h2: <1CM(L)><1L>
-T18957.h3: <LCS(L)><1L>
+T18957.g: <MC(1,L)><1L>
+T18957.h1: <SC(M,L)><1L>
+T18957.h2: <1C(M,L)><1L>
+T18957.h3: <LC(S,L)><1L>
 T18957.seq': <1A><1L>
 
 
@@ -18,10 +18,10 @@ T18957.seq':
 
 
 ==================== Strictness signatures ====================
-T18957.g: <MC1(L)><1L>
-T18957.h1: <SCM(L)><1L>
-T18957.h2: <1CM(L)><1L>
-T18957.h3: <LCS(L)><1L>
+T18957.g: <MC(1,L)><1L>
+T18957.h1: <SC(M,L)><1L>
+T18957.h2: <1C(M,L)><1L>
+T18957.h3: <LC(S,L)><1L>
 T18957.seq': <1A><1L>
 
 
diff --git a/testsuite/tests/stranal/sigs/T19871.stderr b/testsuite/tests/stranal/sigs/T19871.stderr
index 13e67a2805..41f557d08a 100644
--- a/testsuite/tests/stranal/sigs/T19871.stderr
+++ b/testsuite/tests/stranal/sigs/T19871.stderr
@@ -14,7 +14,7 @@ T19871.f6: <1!P(A,A,A,A,A,1L,A,A,A,A,A,A)>
 T19871.f7: <1!P(A,A,A,A,A,A,1L,A,A,A,A,A)>
 T19871.f8: <1!P(A,A,A,A,A,A,A,1L,A,A,A,A)>
 T19871.f9: <1!P(A,A,A,A,A,A,A,A,1L,A,A,A)>
-T19871.guarded: <MC1(L)><1P(SL,L,L,L,L,L,L,L,L,L,L,L)>
+T19871.guarded: <MC(1,L)><1P(SL,L,L,L,L,L,L,L,L,L,L,L)>
 T19871.sumIO: <1!P(1L)><1!P(L)><L>
 T19871.update: <1P(SL,L,L,L,L,L,L,L,L,L,L,L)>
 
@@ -56,7 +56,7 @@ T19871.f6: <1!P(A,A,A,A,A,1L,A,A,A,A,A,A)>
 T19871.f7: <1!P(A,A,A,A,A,A,1L,A,A,A,A,A)>
 T19871.f8: <1!P(A,A,A,A,A,A,A,1L,A,A,A,A)>
 T19871.f9: <1!P(A,A,A,A,A,A,A,A,1L,A,A,A)>
-T19871.guarded: <MC1(L)><1P(SL,L,L,L,L,L,L,L,L,L,L,L)>
+T19871.guarded: <MC(1,L)><1P(SL,L,L,L,L,L,L,L,L,L,L,L)>
 T19871.sumIO: <1!P(1L)><1!P(L)><L>
 T19871.update: <1P(SL,L,L,L,L,L,L,L,L,L,L,L)>
 
diff --git a/testsuite/tests/stranal/sigs/T20746.stderr b/testsuite/tests/stranal/sigs/T20746.stderr
index 65c3e5e296..109bff9198 100644
--- a/testsuite/tests/stranal/sigs/T20746.stderr
+++ b/testsuite/tests/stranal/sigs/T20746.stderr
@@ -12,7 +12,7 @@ Foo.foogle: 1
 
 
 ==================== Strictness signatures ====================
-Foo.f: <MP(A,1C1(L),A)><L>
+Foo.f: <MP(A,1C(1,L),A)><L>
 Foo.foogle: <L><L>
 
 
diff --git a/testsuite/tests/stranal/sigs/T21081.hs b/testsuite/tests/stranal/sigs/T21081.hs
index e07ec410bc..540e9af5ca 100644
--- a/testsuite/tests/stranal/sigs/T21081.hs
+++ b/testsuite/tests/stranal/sigs/T21081.hs
@@ -11,7 +11,7 @@ f pr = (case pr of (a,b) -> a /= b, True)
 g :: Int -> (Bool, Bool)
 g x = let y = let z = odd x in (z,z) in f y
 
--- | Should put demand `LCS(C1(L))` on `f`, telling us that whenever `myfoldl`
+-- | Should put demand `LC(S,C(1,L))` on `f`, telling us that whenever `myfoldl`
 -- evaluates `f`, it will also call it at least once (`S`) and then always call
 -- it with a second argument (`1`).
 -- This in turn allows us to eta-reduce `(\a b -> f a b)` to `f` (not tested,
@@ -20,7 +20,7 @@ myfoldl :: (a -> b -> a) -> a -> [b] -> a
 myfoldl f z [] = z
 myfoldl f !z (x:xs) = myfoldl (\a b -> f a b) (f z x) xs
 
--- | Should put demand `LCL(C1(L))` on `f`
+-- | Should put demand `LC(L,C(1,L))` on `f`
 blah :: (Int -> Int -> Int) -> Int -> Int
 blah f 0 = 0
 blah f 1 = f `seq` 1
diff --git a/testsuite/tests/stranal/sigs/T21081.stderr b/testsuite/tests/stranal/sigs/T21081.stderr
index 7cf5f7cdd8..e6d2f2c309 100644
--- a/testsuite/tests/stranal/sigs/T21081.stderr
+++ b/testsuite/tests/stranal/sigs/T21081.stderr
@@ -1,6 +1,6 @@
 
 ==================== Strictness signatures ====================
-T21081.blah: <LCL(C1(L))><1!P(1L)>
+T21081.blah: <LC(L,C(1,L))><1!P(1L)>
 T21081.blurg: <S!P(SL)>
 T21081.blurg2: <S!P(SL)>
 T21081.call1: <MP(1L,A)>
@@ -9,7 +9,7 @@ T21081.call3: <LP(ML,A)>
 T21081.call4: <MP(1L,A)><1A>
 T21081.call5: <MP(1L,A)><MA>
 T21081.call6: <MP(1L,A)><MP(1L,A)><1L>
-T21081.do_blah: <LCS(C1(L))>
+T21081.do_blah: <LC(S,C(1,L))>
 T21081.f: <MP(SL,SL)>
 T21081.fst': <1!P(1L,A)>
 T21081.g: <ML>
@@ -17,7 +17,7 @@ T21081.h: <MP(ML,ML)><1!P(1L)>
 T21081.h2: <L><S!P(SL)>
 T21081.i: <1L><1L><MP(ML,ML)>
 T21081.j: <S!P(1L,1L)>
-T21081.myfoldl: <LCS(C1(L))><1L><1L>
+T21081.myfoldl: <LC(S,C(1,L))><1L><1L>
 T21081.snd': <1!P(A,1L)>
 
 
@@ -46,7 +46,7 @@ T21081.snd':
 
 
 ==================== Strictness signatures ====================
-T21081.blah: <LCL(C1(L))><1!P(1L)>
+T21081.blah: <LC(L,C(1,L))><1!P(1L)>
 T21081.blurg: <1!P(SL)>
 T21081.blurg2: <1!P(SL)>
 T21081.call1: <MP(1L,A)>
@@ -55,7 +55,7 @@ T21081.call3: <LP(ML,A)>
 T21081.call4: <MP(1L,A)><1A>
 T21081.call5: <MP(1L,A)><MA>
 T21081.call6: <MP(1L,A)><MP(1L,A)><1L>
-T21081.do_blah: <LCS(C1(L))>
+T21081.do_blah: <LC(S,C(1,L))>
 T21081.f: <MP(SL,SL)>
 T21081.fst': <1!P(1L,A)>
 T21081.g: <ML>
@@ -63,7 +63,7 @@ T21081.h: <MP(ML,ML)><1!P(1L)>
 T21081.h2: <L><1!P(SL)>
 T21081.i: <1L><1L><MP(ML,ML)>
 T21081.j: <1!P(1L,1L)>
-T21081.myfoldl: <LCS(C1(L))><1L><1L>
+T21081.myfoldl: <LC(S,C(1,L))><1L><1L>
 T21081.snd': <1!P(A,1L)>
 
 
diff --git a/testsuite/tests/stranal/sigs/T21119.stderr b/testsuite/tests/stranal/sigs/T21119.stderr
index c20b876677..1c27b4c9a4 100644
--- a/testsuite/tests/stranal/sigs/T21119.stderr
+++ b/testsuite/tests/stranal/sigs/T21119.stderr
@@ -4,8 +4,8 @@ T21119.$fMyShow(,): <1!A>
 T21119.$fMyShowInt: <1!A>
 T21119.get: <1!P(1!P(L),1!P(L))><1!P(L)><1L>
 T21119.getIO: <1P(1L,ML)><1L><ML><L>
-T21119.indexError: <1C1(L)><1!B><S!S><S>b
-T21119.throwIndexError: <MC1(L)><MA><L><L><L>x
+T21119.indexError: <1C(1,L)><1!B><S!S><S>b
+T21119.throwIndexError: <MC(1,L)><MA><L><L><L>x
 
 
 
@@ -24,7 +24,7 @@ T21119.$fMyShow(,): <1!A>
 T21119.$fMyShowInt: <1!A>
 T21119.get: <1!P(1!P(L),1!P(L))><1!P(L)><1L>
 T21119.getIO: <1P(1L,ML)><1L><ML><L>
-T21119.indexError: <1C1(L)><1!B><S!S><S>b
-T21119.throwIndexError: <MC1(L)><MA><L><L><L>x
+T21119.indexError: <1C(1,L)><1!B><S!S><S>b
+T21119.throwIndexError: <MC(1,L)><MA><L><L><L>x
 
 
diff --git a/testsuite/tests/stranal/sigs/T21717.stderr b/testsuite/tests/stranal/sigs/T21717.stderr
index 1dd0856f7b..b971191531 100644
--- a/testsuite/tests/stranal/sigs/T21717.stderr
+++ b/testsuite/tests/stranal/sigs/T21717.stderr
@@ -1,6 +1,6 @@
 
 ==================== Strictness signatures ====================
-T21717.g: <SCS(P(ML,ML))>
+T21717.g: <SC(S,P(ML,ML))>
 
 
 
@@ -10,6 +10,6 @@ T21717.g: 1
 
 
 ==================== Strictness signatures ====================
-T21717.g: <SCS(P(ML,ML))>
+T21717.g: <SC(S,P(ML,ML))>
 
 
diff --git a/testsuite/tests/stranal/sigs/T21888.stderr b/testsuite/tests/stranal/sigs/T21888.stderr
index 26681355f0..d52d0c7d78 100644
--- a/testsuite/tests/stranal/sigs/T21888.stderr
+++ b/testsuite/tests/stranal/sigs/T21888.stderr
@@ -1,11 +1,11 @@
 
 ==================== Strictness signatures ====================
 Data.MemoTrie.$fHasTrie(): <L>
-Data.MemoTrie.$fHasTrie(,): <1C1(L)><LCS(L)><L>
+Data.MemoTrie.$fHasTrie(,): <1C(1,L)><LC(S,L)><L>
 Data.MemoTrie.$fHasTrieBool: <1!P(L,L)>
-Data.MemoTrie.$fHasTrieEither: <1C1(L)><1C1(L)><1!P(L,L)>
+Data.MemoTrie.$fHasTrieEither: <1C(1,L)><1C(1,L)><1!P(L,L)>
 Data.MemoTrie.$fHasTrieInteger: <1!P(1!P(S,1!P(1!P(S,1L),1!P(S,1L))),1!P(S,1!P(1!P(S,1L),1!P(S,1L))))>b
-Data.MemoTrie.$fHasTrieList: <SCS(L)><1!P(L,L)>
+Data.MemoTrie.$fHasTrieList: <SC(S,L)><1!P(L,L)>
 
 
 
@@ -21,10 +21,10 @@ Data.MemoTrie.$fHasTrieList:
 
 ==================== Strictness signatures ====================
 Data.MemoTrie.$fHasTrie(): <L>
-Data.MemoTrie.$fHasTrie(,): <1C1(L)><LCS(L)><L>
+Data.MemoTrie.$fHasTrie(,): <1C(1,L)><LC(S,L)><L>
 Data.MemoTrie.$fHasTrieBool: <1!P(L,L)>
-Data.MemoTrie.$fHasTrieEither: <1C1(L)><1C1(L)><1!P(L,L)>
+Data.MemoTrie.$fHasTrieEither: <1C(1,L)><1C(1,L)><1!P(L,L)>
 Data.MemoTrie.$fHasTrieInteger: <1!P(1!P(B,1!P(1!P(B,1!P(L,L)),1!P(B,1!P(L,L)))),1!P(B,1!P(1!B,1!B)))>b
-Data.MemoTrie.$fHasTrieList: <SCS(L)><1!P(L,L)>
+Data.MemoTrie.$fHasTrieList: <SC(S,L)><1!P(L,L)>
 
 
diff --git a/testsuite/tests/stranal/sigs/T5075.stderr b/testsuite/tests/stranal/sigs/T5075.stderr
index 4cebcf85ae..a3eea5d2cd 100644
--- a/testsuite/tests/stranal/sigs/T5075.stderr
+++ b/testsuite/tests/stranal/sigs/T5075.stderr
@@ -1,6 +1,6 @@
 
 ==================== Strictness signatures ====================
-T5075.f: <SP(A,A,SCS(C1(L)),A,A,A,A,A)><LP(A,A,LCS(C1(L)),A,A,A,L)><L>
+T5075.f: <SP(A,A,SC(S,C(1,L)),A,A,A,A,A)><LP(A,A,LC(S,C(1,L)),A,A,A,L)><L>
 T5075.g: <1L><S!P(L)>
 T5075.h: <S!P(L)>
 
@@ -14,7 +14,7 @@ T5075.h:
 
 
 ==================== Strictness signatures ====================
-T5075.f: <SP(A,A,SCS(C1(L)),A,A,A,A,A)><LP(A,A,LCS(C1(L)),A,A,A,L)><L>
+T5075.f: <SP(A,A,SC(S,C(1,L)),A,A,A,A,A)><LP(A,A,LC(S,C(1,L)),A,A,A,L)><L>
 T5075.g: <1L><S!P(L)>
 T5075.h: <1!P(L)>
 
diff --git a/testsuite/tests/stranal/sigs/UnsatFun.stderr b/testsuite/tests/stranal/sigs/UnsatFun.stderr
index cb606f5c02..c6f131d8cb 100644
--- a/testsuite/tests/stranal/sigs/UnsatFun.stderr
+++ b/testsuite/tests/stranal/sigs/UnsatFun.stderr
@@ -4,9 +4,9 @@ UnsatFun.f: <1!P(S)><B>b
 UnsatFun.g: <1!P(S)>b
 UnsatFun.g': <MS>
 UnsatFun.g3: <A>
-UnsatFun.h: <1C1(L)>
-UnsatFun.h2: <1L><MC1(L)>
-UnsatFun.h3: <1C1(A)>
+UnsatFun.h: <1C(1,L)>
+UnsatFun.h2: <1L><MC(1,L)>
+UnsatFun.h3: <1C(1,A)>
 
 
 
@@ -26,8 +26,8 @@ UnsatFun.f: <1!P(S)><B>b
 UnsatFun.g: <1!P(S)>b
 UnsatFun.g': <MS>
 UnsatFun.g3: <A>
-UnsatFun.h: <1C1(L)>
-UnsatFun.h2: <1L><MC1(L)>
-UnsatFun.h3: <1C1(A)>
+UnsatFun.h: <1C(1,L)>
+UnsatFun.h2: <1L><MC(1,L)>
+UnsatFun.h3: <1C(1,A)>