diff --git a/tests/bench/rbmap.hs b/tests/bench/rbmap.hs
index fa8e904111..54c5e54f8f 100644
--- a/tests/bench/rbmap.hs
+++ b/tests/bench/rbmap.hs
@@ -3,48 +3,46 @@ import System.Environment
 data Color =
   Red | Black
 
-data Tree α β =
+data Tree =
   Leaf
-  | Node Color (Tree α β) α β (Tree α β)
+  | Node Color Tree Int Bool Tree
 
-fold :: (α -> β  -> σ  -> σ) -> Tree α β -> σ  -> σ
+fold :: (Int -> Bool -> σ -> σ) -> Tree -> σ -> σ
 fold _ Leaf b               = b
 fold f (Node _ l k v r)   b = fold f r (f k v (fold f l b))
 
-balance1 :: Tree α β -> Tree α β -> Tree α β
-balance1 (Node _ _ kv vv t) (Node _ (Node Red l kx vx r₁) ky vy r₂) = Node Red (Node Black l kx vx r₁) ky vy (Node Black r₂ kv vv t)
-balance1 (Node _ _ kv vv t) (Node _ l₁ ky vy (Node Red l₂ kx vx r)) = Node Red (Node Black l₁ ky vy l₂) kx vx (Node Black r kv vv t)
-balance1 (Node _ _ kv vv t) (Node _ l  ky vy r)                     = Node Black (Node Red l ky vy r) kv vv t
-balance1 _                                                        _ = Leaf
+balance1 :: Int -> Bool -> Tree -> Tree -> Tree
+balance1 kv vv t (Node _ (Node Red l kx vx r₁) ky vy r₂) = Node Red (Node Black l kx vx r₁) ky vy (Node Black r₂ kv vv t)
+balance1 kv vv t (Node _ l₁ ky vy (Node Red l₂ kx vx r)) = Node Red (Node Black l₁ ky vy l₂) kx vx (Node Black r kv vv t)
+balance1 kv vv t (Node _ l  ky vy r)                     = Node Black (Node Red l ky vy r) kv vv t
+balance1 _  _  _ _                                       = Leaf
 
-balance2 :: Tree α β -> Tree α β -> Tree α β
-balance2 (Node _ t kv vv _) (Node _ (Node Red l kx₁ vx₁ r₁) ky vy r₂)  = Node Red (Node Black t kv vv l) kx₁ vx₁ (Node Black r₁ ky vy r₂)
-balance2 (Node _ t kv vv _) (Node _ l₁ ky vy (Node Red l₂ kx₂ vx₂ r₂)) = Node Red (Node Black t kv vv l₁) ky vy (Node Black l₂ kx₂ vx₂ r₂)
-balance2 (Node _ t kv vv _) (Node _ l ky vy r)                         = Node Black t kv vv (Node Red l ky vy r)
-balance2 _                                                        _    = Leaf
+balance2 :: Int -> Bool -> Tree -> Tree -> Tree
+balance2 kv vv t (Node _ (Node Red l kx₁ vx₁ r₁) ky vy r₂)  = Node Red (Node Black t kv vv l) kx₁ vx₁ (Node Black r₁ ky vy r₂)
+balance2 kv vv t (Node _ l₁ ky vy (Node Red l₂ kx₂ vx₂ r₂)) = Node Red (Node Black t kv vv l₁) ky vy (Node Black l₂ kx₂ vx₂ r₂)
+balance2 kv vv t (Node _ l ky vy r)                         = Node Black t kv vv (Node Red l ky vy r)
+balance2 _  _  _ _                                          = Leaf
 
-is_red :: Tree α β -> Bool
+is_red :: Tree -> Bool
 is_red (Node Red _ _ _ _) = True
 is_red _                  = False
 
-lt x y = x < y
-
-ins :: Ord α => Tree α β -> α -> β -> Tree α β
+ins :: Tree -> Int -> Bool -> Tree
 ins Leaf                 kx vx = Node Red Leaf kx vx Leaf
 ins (Node Red a ky vy b) kx vx =
-   (if lt kx ky then Node Red (ins a kx vx) ky vy b
-    else if lt ky kx then Node Red a ky vy (ins b kx vx)
+   (if kx < ky then Node Red (ins a kx vx) ky vy b
+    else if ky < kx then Node Red a ky vy (ins b kx vx)
     else Node Red a ky vy (ins b kx vx))
 ins (Node Black a ky vy b) kx vx =
-    if lt kx ky then
-      (if is_red a then balance1 (Node Black Leaf ky vy b) (ins a kx vx)
+    if kx < ky then
+      (if is_red a then balance1 ky vy b (ins a kx vx)
        else Node Black (ins a kx vx) ky vy b)
-    else if lt ky kx then
-      (if is_red b then balance2 (Node Black a ky vy Leaf) (ins b kx vx)
+    else if ky < kx then
+      (if is_red b then balance2 ky vy a (ins b kx vx)
        else Node Black a ky vy (ins b kx vx))
     else Node Black a kx vx b
 
-set_black :: Tree α β -> Tree α β
+set_black :: Tree -> Tree
 set_black (Node _ l k v r) = Node Black l k v r
 set_black e                = e
 
@@ -52,9 +50,7 @@ insert t k v =
   if is_red t then set_black (ins t k v)
   else ins t k v
 
-type Map = Tree Int Bool
-
-mk_Map_aux :: Int -> Map -> Map
+mk_Map_aux :: Int -> Tree -> Tree
 mk_Map_aux 0 m = m
 mk_Map_aux n m = let n' = n-1 in mk_Map_aux n' (insert m n' (n' `mod` 10 == 0))
 
diff --git a/tests/bench/rbmap_checkpoint.hs b/tests/bench/rbmap_checkpoint.hs
index bff9fdcd1b..48a657d058 100644
--- a/tests/bench/rbmap_checkpoint.hs
+++ b/tests/bench/rbmap_checkpoint.hs
@@ -4,48 +4,46 @@ import System.Environment
 data Color =
   Red | Black
 
-data Tree α β =
+data Tree =
   Leaf
-  | Node Color (Tree α β) α β (Tree α β)
+  | Node Color Tree Int Bool Tree
 
-fold :: (α -> β  -> σ  -> σ) -> Tree α β -> σ  -> σ
+fold :: (Int -> Bool -> σ -> σ) -> Tree -> σ -> σ
 fold _ Leaf b               = b
 fold f (Node _ l k v r)   b = fold f r (f k v (fold f l b))
 
-balance1 :: Tree α β -> Tree α β -> Tree α β
-balance1 (Node _ _ kv vv t) (Node _ (Node Red l kx vx r₁) ky vy r₂) = Node Red (Node Black l kx vx r₁) ky vy (Node Black r₂ kv vv t)
-balance1 (Node _ _ kv vv t) (Node _ l₁ ky vy (Node Red l₂ kx vx r)) = Node Red (Node Black l₁ ky vy l₂) kx vx (Node Black r kv vv t)
-balance1 (Node _ _ kv vv t) (Node _ l  ky vy r)                     = Node Black (Node Red l ky vy r) kv vv t
-balance1 _                                                        _ = Leaf
+balance1 :: Int -> Bool -> Tree -> Tree -> Tree
+balance1 kv vv t (Node _ (Node Red l kx vx r₁) ky vy r₂) = Node Red (Node Black l kx vx r₁) ky vy (Node Black r₂ kv vv t)
+balance1 kv vv t (Node _ l₁ ky vy (Node Red l₂ kx vx r)) = Node Red (Node Black l₁ ky vy l₂) kx vx (Node Black r kv vv t)
+balance1 kv vv t (Node _ l  ky vy r)                     = Node Black (Node Red l ky vy r) kv vv t
+balance1 _  _  _ _                                       = Leaf
 
-balance2 :: Tree α β -> Tree α β -> Tree α β
-balance2 (Node _ t kv vv _) (Node _ (Node Red l kx₁ vx₁ r₁) ky vy r₂)  = Node Red (Node Black t kv vv l) kx₁ vx₁ (Node Black r₁ ky vy r₂)
-balance2 (Node _ t kv vv _) (Node _ l₁ ky vy (Node Red l₂ kx₂ vx₂ r₂)) = Node Red (Node Black t kv vv l₁) ky vy (Node Black l₂ kx₂ vx₂ r₂)
-balance2 (Node _ t kv vv _) (Node _ l ky vy r)                         = Node Black t kv vv (Node Red l ky vy r)
-balance2 _                                                        _    = Leaf
+balance2 :: Int -> Bool -> Tree -> Tree -> Tree
+balance2 kv vv t (Node _ (Node Red l kx₁ vx₁ r₁) ky vy r₂)  = Node Red (Node Black t kv vv l) kx₁ vx₁ (Node Black r₁ ky vy r₂)
+balance2 kv vv t (Node _ l₁ ky vy (Node Red l₂ kx₂ vx₂ r₂)) = Node Red (Node Black t kv vv l₁) ky vy (Node Black l₂ kx₂ vx₂ r₂)
+balance2 kv vv t (Node _ l ky vy r)                         = Node Black t kv vv (Node Red l ky vy r)
+balance2 _  _  _ _                                          = Leaf
 
-is_red :: Tree α β -> Bool
+is_red :: Tree -> Bool
 is_red (Node Red _ _ _ _) = True
 is_red _                  = False
 
-lt x y = x < y
-
-ins :: Ord α => Tree α β -> α -> β -> Tree α β
+ins :: Tree -> Int -> Bool -> Tree
 ins Leaf                 kx vx = Node Red Leaf kx vx Leaf
 ins (Node Red a ky vy b) kx vx =
-   (if lt kx ky then Node Red (ins a kx vx) ky vy b
-    else if lt ky kx then Node Red a ky vy (ins b kx vx)
+   (if kx < ky then Node Red (ins a kx vx) ky vy b
+    else if ky < kx then Node Red a ky vy (ins b kx vx)
     else Node Red a ky vy (ins b kx vx))
 ins (Node Black a ky vy b) kx vx =
-    if lt kx ky then
-      (if is_red a then balance1 (Node Black Leaf ky vy b) (ins a kx vx)
+    if kx < ky then
+      (if is_red a then balance1 ky vy b (ins a kx vx)
        else Node Black (ins a kx vx) ky vy b)
-    else if lt ky kx then
-      (if is_red b then balance2 (Node Black a ky vy Leaf) (ins b kx vx)
+    else if ky < kx then
+      (if is_red b then balance2 ky vy a (ins b kx vx)
        else Node Black a ky vy (ins b kx vx))
     else Node Black a kx vx b
 
-set_black :: Tree α β -> Tree α β
+set_black :: Tree -> Tree
 set_black (Node _ l k v r) = Node Black l k v r
 set_black e                = e
 
@@ -53,9 +51,7 @@ insert t k v =
   if is_red t then set_black (ins t k v)
   else ins t k v
 
-type Map = Tree Int Bool
-
-mk_Map_aux :: Int -> Int -> Map -> [Map] -> [Map]
+mk_Map_aux :: Int -> Int -> Tree -> [Tree] -> [Tree]
 mk_Map_aux freq 0 m r = m:r
 mk_Map_aux freq n m r =
   let n' = n-1 in
@@ -69,7 +65,7 @@ mk_Map_aux freq n m r =
 
 mk_Map n freq = mk_Map_aux freq n Leaf []
 
-myLen :: [Map] -> Int -> Int
+myLen :: [Tree] -> Int -> Int
 myLen ((Node _ _ _ _ _) : xs) r = myLen xs (r+1)
 myLen (_ : xs) r = myLen xs r
 myLen [] r = r