diff --git a/current-versions.txt b/current-versions.txt
--- a/current-versions.txt
+++ b/current-versions.txt
@@ -1,14 +1,14 @@
 This package was tested to work with these dependency
 versions and compiler version.
 These are the default versions fetched by cabal install.
-Tested as of: 2014-07-17 15:20:42.389867 UTC
-Path to compiler: ghc-7.8.2
-Compiler description: 7.8.2
+Tested as of: 2014-08-12 20:30:26.399361 UTC
+Path to compiler: ghc-7.8.3
+Compiler description: 7.8.3
 
-/opt/ghc/7.8.2/lib/ghc-7.8.2/package.conf.d:
+/opt/ghc/7.8.3/lib/ghc-7.8.3/package.conf.d:
     Cabal-1.18.1.3
     array-0.5.0.0
-    base-4.7.0.0
+    base-4.7.0.1
     bin-package-db-0.0.0.0
     binary-0.7.1.0
     rts-1.0
@@ -17,8 +17,9 @@
     deepseq-1.3.0.2
     directory-1.2.1.0
     filepath-1.3.0.2
-    (ghc-7.8.2)
+    (ghc-7.8.3)
     ghc-prim-0.3.1.0
+    haskeline-0.7.1.2
     (haskell2010-1.1.2.0)
     (haskell98-2.0.0.3)
     hoopl-3.10.0.1
@@ -29,22 +30,24 @@
     pretty-1.1.1.1
     process-1.2.0.0
     template-haskell-2.9.0.0
+    terminfo-0.4.0.0
     time-1.4.2
     transformers-0.3.0.0
     unix-2.7.0.1
+    xhtml-3000.2.1
 
-/home/massysett/prednote/tests/sunlight-17585/db:
+/home/massysett/prednote/tests/sunlight-22338/db:
     QuickCheck-2.7.6
-    contravariant-0.6
-    prednote-0.24.2.0
-    prednote-test-0.24.2.0
+    barecheck-0.2.0.0
+    contravariant-0.6.1.1
+    prednote-0.26.0.0
+    prednote-test-0.26.0.0
     primitive-0.5.3.0
     quickpull-0.2.0.0
-    rainbow-0.14.0.2
-    rainbow-tests-0.14.0.2
+    rainbow-0.16.0.0
+    rainbow-tests-0.16.0.0
     random-1.0.1.1
     split-0.2.2
-    terminfo-0.4.0.0
     text-1.1.1.3
     tf-random-0.5
     transformers-compat-0.3.3.4
diff --git a/exe/Prednote/Comparisons/Properties.hs b/exe/Prednote/Comparisons/Properties.hs
--- a/exe/Prednote/Comparisons/Properties.hs
+++ b/exe/Prednote/Comparisons/Properties.hs
@@ -7,7 +7,7 @@
 import Data.Text (Text)
 import qualified Prednote.Comparisons as M
 import qualified Prednote.Core as C
-import Prednote.Tests.Util
+import Prelude.Generators
 
 -- | compareBy is same as compare
 prop_compareBy =
diff --git a/exe/Prednote/Core/Properties.hs b/exe/Prednote/Core/Properties.hs
--- a/exe/Prednote/Core/Properties.hs
+++ b/exe/Prednote/Core/Properties.hs
@@ -6,7 +6,7 @@
 import qualified Prednote.Prebuilt as P
 import qualified Data.Tree as E
 import Test.QuickCheck
-import Prednote.Tests.Util
+import Prelude.Generators
 import Prelude hiding (pred)
 import Control.Monad
 import Test.QuickCheck.Poly (A(..))
diff --git a/exe/Prednote/Prebuilt/Properties.hs b/exe/Prednote/Prebuilt/Properties.hs
--- a/exe/Prednote/Prebuilt/Properties.hs
+++ b/exe/Prednote/Prebuilt/Properties.hs
@@ -2,7 +2,7 @@
 module Prednote.Prebuilt.Properties where
 
 import Prednote.Core.Generators
-import Prednote.Tests.Util
+import Prelude.Generators
 import Test.QuickCheck
 import Test.QuickCheck.Poly (A(..))
 import Data.Text.Generators
diff --git a/genCabal.hs b/genCabal.hs
--- a/genCabal.hs
+++ b/genCabal.hs
@@ -42,6 +42,7 @@
   , quickcheck
   , containers
   , quickpull
+  , barecheck
   ]
 
 library
diff --git a/lib/Data/Tree/Generators.hs b/lib/Data/Tree/Generators.hs
deleted file mode 100644
--- a/lib/Data/Tree/Generators.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-module Data.Tree.Generators where
-
-import Data.Tree
-import Test.QuickCheck
-import Control.Monad
-
-tree :: Gen a -> Gen (Tree a)
-tree g = sized h
-  where
-    h s = liftM2 Node g cs
-      where
-        cs | s <= 0 = return []
-           | otherwise = resize (s `div` 8) (listOf (tree g))
diff --git a/lib/Prednote/Core/Generators.hs b/lib/Prednote/Core/Generators.hs
--- a/lib/Prednote/Core/Generators.hs
+++ b/lib/Prednote/Core/Generators.hs
@@ -2,8 +2,8 @@
 
 import Test.QuickCheck hiding (output)
 import qualified Prednote.Core as C
-import Prednote.Tests.Util
-import System.Console.Rainbow.Types.Generators
+import Prelude.Generators
+import Rainbow.Types.Generators
 import Control.Monad
 import Prelude hiding (pred)
 import Data.Tree.Generators
@@ -20,7 +20,8 @@
   chunker
 
 pred :: Gen (C.Pred Int)
-pred = liftM2 C.Pred (tree chunker) (function1 variant (tree output))
+pred = liftM2 C.Pred (tree (`div` 8) chunker)
+  (function1 variant (tree (`div` 8) output))
 
 dynamicLabel :: Gen (Bool -> Int -> C.Chunker)
 dynamicLabel = function2 coarbitrary coarbitrary chunker
diff --git a/lib/Prednote/Tests/Util.hs b/lib/Prednote/Tests/Util.hs
deleted file mode 100644
--- a/lib/Prednote/Tests/Util.hs
+++ /dev/null
@@ -1,31 +0,0 @@
-module Prednote.Tests.Util where
-
-import Test.QuickCheck
-import Test.QuickCheck.Gen.Unsafe
-
-function1
-  :: (a -> Gen b -> Gen b)
-  -> Gen b
-  -> Gen (a -> b)
-function1 perturb gen = promote (`perturb` gen)
-
-function2
-  :: (a -> Gen r -> Gen r)
-  -> (b -> Gen r -> Gen r)
-  -> Gen r
-  -> Gen (a -> b -> r)
-function2 p1 p2 = fmap f . function1 p'
-  where
-    p' (a, b) = p1 a . p2 b
-    f g = \a b -> g (a, b)
-
-function3
-  :: (a -> Gen r -> Gen r)
-  -> (b -> Gen r -> Gen r)
-  -> (c -> Gen r -> Gen r)
-  -> Gen r
-  -> Gen (a -> b -> c -> r)
-function3 p1 p2 p3 = fmap f . function1 p'
-  where
-    p' (a, b, c) = p1 a . p2 b . p3 c
-    f g = \a b c -> g (a, b, c)
diff --git a/minimum-versions.txt b/minimum-versions.txt
--- a/minimum-versions.txt
+++ b/minimum-versions.txt
@@ -1,7 +1,7 @@
 This package was tested to work with these dependency
 versions and compiler version.
 These are the minimum versions given in the .cabal file.
-Tested as of: 2014-07-17 15:20:42.389867 UTC
+Tested as of: 2014-08-12 20:30:26.399361 UTC
 Path to compiler: ghc-7.4.1
 Compiler description: 7.4.1
 
@@ -33,15 +33,16 @@
     time-1.4
     unix-2.5.1.0
 
-/home/massysett/prednote/tests/sunlight-17585/db:
+/home/massysett/prednote/tests/sunlight-22338/db:
     QuickCheck-2.7.5
-    contravariant-0.6
-    prednote-0.24.2.0
-    prednote-test-0.24.2.0
+    barecheck-0.2.0.0
+    contravariant-0.6.1.1
+    prednote-0.26.0.0
+    prednote-test-0.26.0.0
     primitive-0.5.3.0
     quickpull-0.2.0.0
-    rainbow-0.14.0.2
-    rainbow-tests-0.14.0.2
+    rainbow-0.16.0.0
+    rainbow-tests-0.16.0.0
     random-1.0.1.1
     split-0.2.2
     tagged-0.7.2
diff --git a/prednote-test.cabal b/prednote-test.cabal
--- a/prednote-test.cabal
+++ b/prednote-test.cabal
@@ -3,10 +3,10 @@
 -- http://www.github.com/massysett/cartel
 --
 -- Script name used to generate: genCabal.hs
--- Generated on: 2014-07-17 11:13:28.670981 EDT
+-- Generated on: 2014-08-12 16:16:44.215381 EDT
 -- Cartel library version: 0.10.0.2
 name: prednote-test
-version: 0.24.2.0
+version: 0.26.0.0
 cabal-version: >= 1.14
 build-type: Simple
 license: BSD3
@@ -35,18 +35,17 @@
 
 Library
   exposed-modules:
-      Data.Tree.Generators
-    , Prednote.Core.Generators
-    , Prednote.Tests.Util
+      Prednote.Core.Generators
   build-depends:
       base ((> 4.5.0.0 || == 4.5.0.0) && < 5)
-    , rainbow ((> 0.14.0.2 || == 0.14.0.2) && < 0.15)
-    , rainbow-tests ((> 0.14.0.2 || == 0.14.0.2) && < 0.15)
+    , rainbow ((> 0.16.0.0 || == 0.16.0.0) && < 0.17)
+    , rainbow-tests ((> 0.16.0.0 || == 0.16.0.0) && < 0.17)
     , text ((> 0.11.2.0 || == 0.11.2.0) && < 1.2)
-    , prednote == 0.24.2.0
+    , prednote == 0.26.0.0
     , QuickCheck ((> 2.7.5 || == 2.7.5) && < 2.8)
     , containers ((> 0.4.2.1 || == 0.4.2.1) && < 0.6)
     , quickpull ((> 0.2.0.0 || == 0.2.0.0) && < 0.3)
+    , barecheck ((> 0.2.0.0 || == 0.2.0.0) && < 0.3)
   hs-source-dirs:
       lib
   ghc-options:
@@ -58,9 +57,7 @@
       lib
     , exe
   other-modules:
-      Data.Tree.Generators
-    , Prednote.Core.Generators
-    , Prednote.Tests.Util
+      Prednote.Core.Generators
     , Decrees
     , Prednote.Comparisons.Properties
     , Prednote.Core.Properties
@@ -71,13 +68,14 @@
   default-language: Haskell2010
   build-depends:
       base ((> 4.5.0.0 || == 4.5.0.0) && < 5)
-    , rainbow ((> 0.14.0.2 || == 0.14.0.2) && < 0.15)
-    , rainbow-tests ((> 0.14.0.2 || == 0.14.0.2) && < 0.15)
+    , rainbow ((> 0.16.0.0 || == 0.16.0.0) && < 0.17)
+    , rainbow-tests ((> 0.16.0.0 || == 0.16.0.0) && < 0.17)
     , text ((> 0.11.2.0 || == 0.11.2.0) && < 1.2)
-    , prednote == 0.24.2.0
+    , prednote == 0.26.0.0
     , QuickCheck ((> 2.7.5 || == 2.7.5) && < 2.8)
     , containers ((> 0.4.2.1 || == 0.4.2.1) && < 0.6)
     , quickpull ((> 0.2.0.0 || == 0.2.0.0) && < 0.3)
+    , barecheck ((> 0.2.0.0 || == 0.2.0.0) && < 0.3)
 
 Executable prednote-visual-test
   hs-source-dirs:
@@ -89,10 +87,11 @@
   default-language: Haskell2010
   build-depends:
       base ((> 4.5.0.0 || == 4.5.0.0) && < 5)
-    , rainbow ((> 0.14.0.2 || == 0.14.0.2) && < 0.15)
-    , rainbow-tests ((> 0.14.0.2 || == 0.14.0.2) && < 0.15)
+    , rainbow ((> 0.16.0.0 || == 0.16.0.0) && < 0.17)
+    , rainbow-tests ((> 0.16.0.0 || == 0.16.0.0) && < 0.17)
     , text ((> 0.11.2.0 || == 0.11.2.0) && < 1.2)
-    , prednote == 0.24.2.0
+    , prednote == 0.26.0.0
     , QuickCheck ((> 2.7.5 || == 2.7.5) && < 2.8)
     , containers ((> 0.4.2.1 || == 0.4.2.1) && < 0.6)
     , quickpull ((> 0.2.0.0 || == 0.2.0.0) && < 0.3)
+    , barecheck ((> 0.2.0.0 || == 0.2.0.0) && < 0.3)
diff --git a/sunlight-test.hs b/sunlight-test.hs
--- a/sunlight-test.hs
+++ b/sunlight-test.hs
@@ -8,7 +8,7 @@
   , tiLowest = ("7.4.1", "ghc-7.4.1", "ghc-pkg-7.4.1")
   , tiDefault = [ ("7.4.1", "ghc-7.4.1", "ghc-pkg-7.4.1")
                 , ("7.6.3", "ghc-7.6.3", "ghc-pkg-7.6.3")
-                , ("7.8.2", "ghc-7.8.2", "ghc-pkg-7.8.2") ]
+                , ("7.8.3", "ghc-7.8.3", "ghc-pkg-7.8.3") ]
   , tiTest = [("dist/build/prednote-test/prednote-test", [])]
   }
 
diff --git a/visual/prednote-visual-test.hs b/visual/prednote-visual-test.hs
--- a/visual/prednote-visual-test.hs
+++ b/visual/prednote-visual-test.hs
@@ -6,7 +6,7 @@
 import Prednote.Comparisons
 import Prednote.Format
 import qualified Data.Text as X
-import System.Console.Rainbow
+import Rainbow
 import Data.Monoid
 
 singleInt :: Pred Int