diff --git a/common/CommonTest.hs b/common/CommonTest.hs
index 5aad643..da67c33 100644
--- a/common/CommonTest.hs
+++ b/common/CommonTest.hs
@@ -89,24 +89,18 @@ testCheckTreeForConstr :: Test
 testCheckTreeForConstr = TestList
  [
    doTest (0,A.Int,[],[])
-  ,doTest (1,A.Int,[tc0 A.Int],[ADI A.Int])
-  ,doTest (100, A.True emptyMeta, [tc1 A.True],[ADI $ A.True emptyMeta])
+  ,doTest (1,A.Int,[con0 A.Int],[ADI A.Int])
+  ,doTest (100, A.True emptyMeta, [con1 A.True],[ADI $ A.True emptyMeta])
   
-  ,doTest (200, A.Seq emptyMeta $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta], [tc1 A.Skip], [ADI $ A.Skip emptyMeta])
-  ,doTest (201, A.Seq emptyMeta $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta], [tc2 A.Several], [ADI $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta]])
-  ,doTest (202, A.Seq emptyMeta $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta], [tc0 A.Int], [])
-  ,doTest (203, A.Seq emptyMeta $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta], [tc2 A.OnlyP, tc1 A.Skip],
+  ,doTest (200, A.Seq emptyMeta $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta], [con1 A.Skip], [ADI $ A.Skip emptyMeta])
+  ,doTest (201, A.Seq emptyMeta $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta], [con2 A.Several], [ADI $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta]])
+  ,doTest (202, A.Seq emptyMeta $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta], [con0 A.Int], [])
+  ,doTest (203, A.Seq emptyMeta $ A.Several emptyMeta [A.OnlyP emptyMeta $ A.Skip emptyMeta], [con2 A.OnlyP, con1 A.Skip],
     [ADI $ A.OnlyP emptyMeta $ A.Skip emptyMeta, ADI $ A.Skip emptyMeta])
  ]
  where
    doTest :: Data a => (Int, a, [Constr], [AnyDataItem]) -> Test
    doTest (n,testIn,testFor,testOut) = TestCase $ assertEqual ("testCheckAny " ++ (show n)) testOut (checkTreeForConstr testFor testIn)
-   tc0 :: Data a => a -> Constr
-   tc0 = toConstr
-   tc1 :: Data a => (a0 -> a) -> Constr
-   tc1 f = toConstr (f undefined)
-   tc2 :: Data a => (a0 -> a1 -> a) -> Constr
-   tc2 f = toConstr (f undefined undefined)
 
 --Returns the list of tests:
 tests :: Test
diff --git a/common/TreeUtil.hs b/common/TreeUtil.hs
index 0ebc8ad..0b7bb1b 100644
--- a/common/TreeUtil.hs
+++ b/common/TreeUtil.hs
@@ -16,7 +16,15 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 -}
 
-module TreeUtil (MatchErrors, AnyDataItem(..), Items, castADI, assertPatternMatch, getMatchedItems, mkPattern, tag0, tag1, tag2, tag3, tag4, tag5, tag6, tag7, tag1d, tag2d, tag3d, tag4d, tag5d, tag6d, tag7d, stopCaringPattern, namePattern, nameAndStopCaringPattern, checkTreeForConstr) where
+module TreeUtil (
+  MatchErrors, 
+  AnyDataItem(..), Items, castADI, 
+  assertPatternMatch, getMatchedItems, 
+  tag0, tag1, tag2, tag3, tag4, tag5, tag6, tag7, tag1d, tag2d, tag3d, tag4d, tag5d, tag6d, tag7d, 
+  mkPattern, stopCaringPattern, namePattern, nameAndStopCaringPattern, 
+  checkTreeForConstr,
+  con0, con1, con2, con3, con4, con5, con6, con7
+  ) where
 
 import Test.HUnit hiding (State)
 import qualified Data.Map as Map
@@ -338,3 +346,37 @@ checkTreeForConstr cons = makeCheckFunction $ zip (map constrType cons) cons
     makeCheckFunction' (tr,con) d = (show (dataTypeOf d) == show tr) && (c == con) && (show c == show con)
       where
         c = toConstr d
+
+-- | Converts a 0-argument constructor into its Constr form.
+con0 :: Data a => a -> Constr
+con0 = toConstr
+
+-- | Converts a 1-argument constructor into its Constr form.
+con1 :: Data a => (a0  -> a) -> Constr
+con1 f = toConstr (f undefined)
+
+-- | Converts a 2-argument constructor into its Constr form.
+con2 :: Data a => (a0 -> a1 -> a) -> Constr
+con2 f = toConstr (f undefined undefined)
+
+-- | Converts a 3-argument constructor into its Constr form.
+con3 :: Data a => (a0 -> a1 -> a2 -> a) -> Constr
+con3 f = toConstr (f undefined undefined undefined)
+
+-- | Converts a 4-argument constructor into its Constr form.
+con4 :: Data a => (a0 -> a1 -> a2 -> a3 -> a) -> Constr
+con4 f = toConstr (f undefined undefined undefined undefined)
+
+-- | Converts a 5-argument constructor into its Constr form.
+con5 :: Data a => (a0 -> a1 -> a2 -> a3 -> a4 -> a) -> Constr
+con5 f = toConstr (f undefined undefined undefined undefined undefined)
+
+-- | Converts a 6-argument constructor into its Constr form.
+con6 :: Data a => (a0 -> a1 -> a2 -> a3 -> a4 -> a5 -> a) -> Constr
+con6 f = toConstr (f undefined undefined undefined undefined undefined undefined)
+
+-- | Converts a 7-argument constructor into its Constr form.
+con7 :: Data a => (a0 -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a) -> Constr
+con7 f = toConstr (f undefined undefined undefined undefined undefined undefined undefined)
+
+