11 files changed, 20 insertions, 20 deletions
diff --git a/stdlib/source/lux/function/cont.lux b/stdlib/source/lux/control/cont.lux
index 08f784035..08f784035 100644
--- a/stdlib/source/lux/function/cont.lux
+++ b/stdlib/source/lux/control/cont.lux
diff --git a/stdlib/source/lux/function/reader.lux b/stdlib/source/lux/control/reader.lux
index 598bfc670..598bfc670 100644
--- a/stdlib/source/lux/function/reader.lux
+++ b/stdlib/source/lux/control/reader.lux
diff --git a/stdlib/source/lux/function/state.lux b/stdlib/source/lux/control/state.lux
index 9ee12e93d..9ee12e93d 100644
--- a/stdlib/source/lux/function/state.lux
+++ b/stdlib/source/lux/control/state.lux
diff --git a/stdlib/source/lux/function/thunk.lux b/stdlib/source/lux/control/thunk.lux
index 03545b8b6..03545b8b6 100644
--- a/stdlib/source/lux/function/thunk.lux
+++ b/stdlib/source/lux/control/thunk.lux
diff --git a/stdlib/source/lux/data/coll/stream.lux b/stdlib/source/lux/data/coll/stream.lux
index f8ee835b3..b620c5af2 100644
--- a/stdlib/source/lux/data/coll/stream.lux
+++ b/stdlib/source/lux/data/coll/stream.lux
@@ -2,12 +2,12 @@
   lux
   (lux (control functor
                 monad
-                comonad)
+                comonad
+                [cont #+ pending Cont])
        [compiler #+ with-gensyms]
        (macro ["s" syntax #+ syntax: Syntax])
        (data (coll [list "List/" Monad<List>])
-             bool)
-       (function [cont #+ pending Cont])))
+             bool)))
 
 ## [Types]
 (type: #export (Stream a)
diff --git a/stdlib/test/test/lux/function/cont.lux b/stdlib/test/test/lux/control/cont.lux
index 4362f5a75..133629e45 100644
--- a/stdlib/test/test/lux/function/cont.lux
+++ b/stdlib/test/test/lux/control/cont.lux
@@ -1,13 +1,13 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control monad
+                ["&" cont])
        (data [text "Text/" Monoid<Text>]
              text/format
              [number]
              [product]
              (coll [list]))
-       (function ["&" cont])
        ["R" math/random])
   lux/test)
 
diff --git a/stdlib/test/test/lux/function/reader.lux b/stdlib/test/test/lux/control/reader.lux
index 602efc603..85b5edf8b 100644
--- a/stdlib/test/test/lux/function/reader.lux
+++ b/stdlib/test/test/lux/control/reader.lux
@@ -2,11 +2,11 @@
   lux
   (lux [io]
        (control monad
-                pipe)
+                pipe
+                ["&" reader])
        (data [text "Text/" Monoid<Text>]
              text/format
-             [number])
-       (function ["&" reader]))
+             [number]))
   lux/test)
 
 (test: "Readers"
diff --git a/stdlib/test/test/lux/function/state.lux b/stdlib/test/test/lux/control/state.lux
index 9ef61e4d3..e02dfdf55 100644
--- a/stdlib/test/test/lux/function/state.lux
+++ b/stdlib/test/test/lux/control/state.lux
@@ -2,12 +2,12 @@
   lux
   (lux [io]
        (control monad
-                pipe)
+                pipe
+                ["&" state])
        (data [text "Text/" Monoid<Text>]
              text/format
              [number]
-             [product])
-       (function ["&" state]))
+             [product]))
   lux/test)
 
 (test: "State"
diff --git a/stdlib/test/test/lux/function/thunk.lux b/stdlib/test/test/lux/control/thunk.lux
index 753398f77..cc8ca653d 100644
--- a/stdlib/test/test/lux/function/thunk.lux
+++ b/stdlib/test/test/lux/control/thunk.lux
@@ -1,8 +1,8 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
-       (function ["&" thunk])
+       (control monad
+                ["&" thunk])
        ["R" math/random])
   lux/test)
 
diff --git a/stdlib/test/test/lux/data/coll/stream.lux b/stdlib/test/test/lux/data/coll/stream.lux
index edc7d52dc..f68ae60f3 100644
--- a/stdlib/test/test/lux/data/coll/stream.lux
+++ b/stdlib/test/test/lux/data/coll/stream.lux
@@ -2,13 +2,13 @@
   lux
   (lux [io]
        (control monad
-                comonad)
+                comonad
+                [cont])
        (data [text "Text/" Monoid<Text>]
              text/format
              (coll [list]
                    ["&" stream])
              [number "Nat/" Codec<Text,Nat>])
-       (function [cont])
        ["R" math/random])
   lux/test)
 
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 931a89e28..4cb00c4a7 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -9,10 +9,6 @@
         (lux ["_;" cli]
              ["_;" host]
              ["_;" io]
-             (function ["_;" cont]
-               ["_;" reader]
-               ["_;" state]
-               ["_;" thunk])
              (concurrency ["_;" actor]
                           ["_;" atom]
                           ["_;" frp]
@@ -20,7 +16,11 @@
                           ["_;" stm])
              (control ["_;" effect]
                       ["_;" interval]
-                      ["_;" pipe])
+                      ["_;" pipe]
+                      ["_;" cont]
+                      ["_;" reader]
+                      ["_;" state]
+                      ["_;" thunk])
              (data ["_;" bit]
                    ["_;" bool]
                    ["_;" char]