From 5d44577c3849a045052dc1c9f0dd7deddd032120 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 1 Jun 2022 21:52:34 -0400
Subject: Extensible import syntax: Part 1

---
 stdlib/source/documentation/lux.lux                |  8 ++--
 stdlib/source/documentation/lux/abstract.lux       | 44 ++++++++---------
 stdlib/source/documentation/lux/abstract/apply.lux | 10 ++--
 stdlib/source/documentation/lux/abstract/codec.lux |  2 +-
 .../source/documentation/lux/abstract/comonad.lux  | 20 ++++----
 .../documentation/lux/abstract/comonad/cofree.lux  | 10 ++--
 stdlib/source/documentation/lux/abstract/enum.lux  | 10 ++--
 .../documentation/lux/abstract/equivalence.lux     | 16 +++----
 .../source/documentation/lux/abstract/functor.lux  |  6 +--
 .../lux/abstract/functor/contravariant.lux         | 10 ++--
 stdlib/source/documentation/lux/abstract/hash.lux  | 16 +++----
 .../source/documentation/lux/abstract/interval.lux | 16 +++----
 stdlib/source/documentation/lux/abstract/mix.lux   | 16 +++----
 stdlib/source/documentation/lux/abstract/monad.lux | 20 ++++----
 .../documentation/lux/abstract/monad/free.lux      | 10 ++--
 .../source/documentation/lux/abstract/monoid.lux   | 16 +++----
 stdlib/source/documentation/lux/abstract/order.lux | 16 +++----
 .../documentation/lux/abstract/predicate.lux       | 16 +++----
 stdlib/source/documentation/lux/control.lux        | 56 +++++++++++-----------
 .../documentation/lux/control/concatenative.lux    |  4 +-
 .../documentation/lux/control/concurrency.lux      | 32 ++++++-------
 .../lux/control/concurrency/actor.lux              |  6 +--
 .../lux/control/concurrency/async.lux              | 20 ++++----
 .../documentation/lux/control/concurrency/atom.lux | 20 ++++----
 .../documentation/lux/control/concurrency/frp.lux  | 20 ++++----
 .../lux/control/concurrency/semaphore.lux          | 20 ++++----
 .../documentation/lux/control/concurrency/stm.lux  |  6 +--
 .../lux/control/concurrency/thread.lux             | 20 ++++----
 .../documentation/lux/control/continuation.lux     | 20 ++++----
 .../source/documentation/lux/control/exception.lux |  6 +--
 .../source/documentation/lux/control/function.lux  | 30 ++++++------
 .../lux/control/function/contract.lux              | 20 ++++----
 .../documentation/lux/control/function/memo.lux    |  6 +--
 .../documentation/lux/control/function/mixin.lux   | 20 ++++----
 .../documentation/lux/control/function/mutual.lux  | 20 ++++----
 stdlib/source/documentation/lux/control/io.lux     | 20 ++++----
 stdlib/source/documentation/lux/control/lazy.lux   | 20 ++++----
 stdlib/source/documentation/lux/control/maybe.lux  | 20 ++++----
 stdlib/source/documentation/lux/control/parser.lux | 44 ++++++++---------
 .../documentation/lux/control/parser/analysis.lux  |  6 +--
 .../documentation/lux/control/parser/binary.lux    |  6 +--
 .../documentation/lux/control/parser/cli.lux       |  6 +--
 .../documentation/lux/control/parser/code.lux      |  6 +--
 .../lux/control/parser/environment.lux             | 20 ++++----
 .../documentation/lux/control/parser/json.lux      |  6 +--
 .../documentation/lux/control/parser/synthesis.lux |  6 +--
 .../documentation/lux/control/parser/text.lux      |  6 +--
 .../documentation/lux/control/parser/tree.lux      |  6 +--
 .../documentation/lux/control/parser/type.lux      |  6 +--
 .../documentation/lux/control/parser/xml.lux       | 20 ++++----
 stdlib/source/documentation/lux/control/pipe.lux   |  6 +--
 stdlib/source/documentation/lux/control/reader.lux | 20 ++++----
 stdlib/source/documentation/lux/control/region.lux | 20 ++++----
 .../source/documentation/lux/control/remember.lux  | 20 ++++----
 .../source/documentation/lux/control/security.lux  | 22 ++++-----
 .../lux/control/security/capability.lux            | 20 ++++----
 .../documentation/lux/control/security/policy.lux  |  6 +--
 stdlib/source/documentation/lux/control/state.lux  | 20 ++++----
 stdlib/source/documentation/lux/control/thread.lux | 20 ++++----
 stdlib/source/documentation/lux/control/try.lux    | 20 ++++----
 stdlib/source/documentation/lux/control/writer.lux | 20 ++++----
 stdlib/source/documentation/lux/data.lux           | 36 +++++++-------
 stdlib/source/documentation/lux/data/binary.lux    |  6 +--
 stdlib/source/documentation/lux/data/bit.lux       | 20 ++++----
 .../source/documentation/lux/data/collection.lux   | 38 +++++++--------
 .../documentation/lux/data/collection/array.lux    | 30 ++++++------
 .../documentation/lux/data/collection/bits.lux     | 30 ++++++------
 .../lux/data/collection/dictionary.lux             |  8 ++--
 .../lux/data/collection/dictionary/ordered.lux     |  8 ++--
 .../lux/data/collection/dictionary/plist.lux       |  8 ++--
 .../documentation/lux/data/collection/list.lux     |  8 ++--
 .../documentation/lux/data/collection/queue.lux    | 34 ++++++-------
 .../lux/data/collection/queue/priority.lux         | 30 ++++++------
 .../documentation/lux/data/collection/sequence.lux |  8 ++--
 .../documentation/lux/data/collection/set.lux      |  6 +--
 .../lux/data/collection/set/multi.lux              |  6 +--
 .../lux/data/collection/set/ordered.lux            |  6 +--
 .../documentation/lux/data/collection/stack.lux    | 26 +++++-----
 .../documentation/lux/data/collection/stream.lux   |  8 ++--
 .../documentation/lux/data/collection/tree.lux     |  6 +--
 .../lux/data/collection/tree/finger.lux            | 26 +++++-----
 .../lux/data/collection/tree/zipper.lux            | 26 +++++-----
 stdlib/source/documentation/lux/data/color.lux     | 34 ++++++-------
 .../source/documentation/lux/data/color/named.lux  | 38 +++++++--------
 stdlib/source/documentation/lux/data/format.lux    | 26 +++++-----
 .../documentation/lux/data/format/binary.lux       |  6 +--
 .../source/documentation/lux/data/format/json.lux  |  6 +--
 .../source/documentation/lux/data/format/tar.lux   |  6 +--
 .../source/documentation/lux/data/format/xml.lux   | 20 ++++----
 stdlib/source/documentation/lux/data/identity.lux  | 20 ++++----
 stdlib/source/documentation/lux/data/product.lux   |  4 +-
 stdlib/source/documentation/lux/data/sum.lux       |  6 +--
 stdlib/source/documentation/lux/data/text.lux      |  4 +-
 .../source/documentation/lux/data/text/buffer.lux  | 20 ++++----
 .../documentation/lux/data/text/encoding.lux       | 24 +++++-----
 .../documentation/lux/data/text/encoding/utf8.lux  | 20 ++++----
 .../source/documentation/lux/data/text/escape.lux  | 20 ++++----
 .../source/documentation/lux/data/text/format.lux  |  2 +-
 .../source/documentation/lux/data/text/regex.lux   |  6 +--
 .../source/documentation/lux/data/text/unicode.lux | 22 ++++-----
 .../documentation/lux/data/text/unicode/block.lux  |  4 +-
 .../documentation/lux/data/text/unicode/set.lux    |  4 +-
 stdlib/source/documentation/lux/debug.lux          |  6 +--
 stdlib/source/documentation/lux/documentation.lux  |  4 +-
 stdlib/source/documentation/lux/extension.lux      |  4 +-
 stdlib/source/documentation/lux/ffi.js.lux         |  6 +--
 stdlib/source/documentation/lux/ffi.jvm.lux        |  6 +--
 stdlib/source/documentation/lux/ffi.lua.lux        |  6 +--
 stdlib/source/documentation/lux/ffi.old.lux        |  6 +--
 stdlib/source/documentation/lux/ffi.py.lux         |  6 +--
 stdlib/source/documentation/lux/ffi.rb.lux         |  6 +--
 stdlib/source/documentation/lux/locale.lux         | 26 +++++-----
 .../source/documentation/lux/locale/language.lux   | 20 ++++----
 .../source/documentation/lux/locale/territory.lux  | 20 ++++----
 stdlib/source/documentation/lux/macro.lux          | 30 ++++++------
 stdlib/source/documentation/lux/macro/code.lux     | 20 ++++----
 stdlib/source/documentation/lux/macro/local.lux    | 20 ++++----
 stdlib/source/documentation/lux/macro/syntax.lux   |  6 +--
 .../documentation/lux/macro/syntax/check.lux       | 20 ++++----
 .../documentation/lux/macro/syntax/declaration.lux | 20 ++++----
 .../documentation/lux/macro/syntax/definition.lux  | 20 ++++----
 .../documentation/lux/macro/syntax/export.lux      | 20 ++++----
 .../documentation/lux/macro/syntax/input.lux       | 20 ++++----
 .../lux/macro/syntax/type/variable.lux             | 20 ++++----
 stdlib/source/documentation/lux/macro/template.lux | 20 ++++----
 stdlib/source/documentation/lux/math.lux           |  4 +-
 stdlib/source/documentation/lux/math/infix.lux     | 20 ++++----
 stdlib/source/documentation/lux/math/logic.lux     |  4 +-
 .../documentation/lux/math/logic/continuous.lux    | 20 ++++----
 .../source/documentation/lux/math/logic/fuzzy.lux  | 20 ++++----
 stdlib/source/documentation/lux/math/modular.lux   | 20 ++++----
 stdlib/source/documentation/lux/math/modulus.lux   | 20 ++++----
 stdlib/source/documentation/lux/math/number.lux    | 42 ++++++++--------
 .../documentation/lux/math/number/complex.lux      |  6 +--
 .../source/documentation/lux/math/number/frac.lux  |  6 +--
 .../source/documentation/lux/math/number/i16.lux   | 20 ++++----
 .../source/documentation/lux/math/number/i32.lux   | 20 ++++----
 .../source/documentation/lux/math/number/i64.lux   | 20 ++++----
 stdlib/source/documentation/lux/math/number/i8.lux | 20 ++++----
 .../source/documentation/lux/math/number/int.lux   | 20 ++++----
 .../source/documentation/lux/math/number/nat.lux   | 20 ++++----
 .../source/documentation/lux/math/number/ratio.lux | 20 ++++----
 .../source/documentation/lux/math/number/rev.lux   | 20 ++++----
 stdlib/source/documentation/lux/math/random.lux    |  6 +--
 stdlib/source/documentation/lux/meta.lux           | 26 +++++-----
 stdlib/source/documentation/lux/meta/location.lux  | 20 ++++----
 stdlib/source/documentation/lux/meta/symbol.lux    | 20 ++++----
 stdlib/source/documentation/lux/program.lux        | 24 +++++-----
 stdlib/source/documentation/lux/static.lux         |  4 +-
 stdlib/source/documentation/lux/target.lux         | 32 ++++++-------
 stdlib/source/documentation/lux/target/js.lux      |  6 +--
 stdlib/source/documentation/lux/target/jvm.lux     |  6 +--
 .../source/documentation/lux/target/jvm/type.lux   |  6 +--
 .../documentation/lux/target/jvm/type/alias.lux    |  6 +--
 .../documentation/lux/target/jvm/type/box.lux      |  6 +--
 .../documentation/lux/target/jvm/type/category.lux |  6 +--
 .../lux/target/jvm/type/descriptor.lux             |  6 +--
 .../documentation/lux/target/jvm/type/lux.lux      |  6 +--
 .../documentation/lux/target/jvm/type/parser.lux   |  6 +--
 .../lux/target/jvm/type/reflection.lux             |  6 +--
 .../lux/target/jvm/type/signature.lux              |  6 +--
 stdlib/source/documentation/lux/target/lua.lux     |  6 +--
 stdlib/source/documentation/lux/target/python.lux  |  6 +--
 stdlib/source/documentation/lux/target/ruby.lux    |  6 +--
 stdlib/source/documentation/lux/test.lux           |  6 +--
 stdlib/source/documentation/lux/time.lux           | 40 ++++++++--------
 stdlib/source/documentation/lux/time/date.lux      | 26 +++++-----
 stdlib/source/documentation/lux/time/day.lux       | 26 +++++-----
 stdlib/source/documentation/lux/time/duration.lux  |  6 +--
 stdlib/source/documentation/lux/time/instant.lux   | 26 +++++-----
 stdlib/source/documentation/lux/time/month.lux     | 26 +++++-----
 stdlib/source/documentation/lux/time/year.lux      | 26 +++++-----
 stdlib/source/documentation/lux/tool.lux           | 34 ++++++-------
 .../lux/tool/compiler/language/lux/analysis.lux    |  6 +--
 .../lux/tool/compiler/language/lux/directive.lux   | 20 ++++----
 .../lux/tool/compiler/language/lux/generation.lux  |  6 +--
 .../lux/tool/compiler/language/lux/synthesis.lux   |  6 +--
 .../documentation/lux/tool/compiler/phase.lux      | 20 ++++----
 stdlib/source/documentation/lux/type.lux           |  4 +-
 stdlib/source/documentation/lux/type/check.lux     | 26 +++++-----
 stdlib/source/documentation/lux/type/dynamic.lux   |  6 +--
 stdlib/source/documentation/lux/type/implicit.lux  | 26 +++++-----
 stdlib/source/documentation/lux/type/poly.lux      | 34 ++++++-------
 stdlib/source/documentation/lux/type/primitive.lux |  6 +--
 stdlib/source/documentation/lux/type/quotient.lux  |  6 +--
 .../source/documentation/lux/type/refinement.lux   |  6 +--
 stdlib/source/documentation/lux/type/resource.lux  | 26 +++++-----
 stdlib/source/documentation/lux/type/unit.lux      |  6 +--
 stdlib/source/documentation/lux/type/variance.lux  | 26 +++++-----
 stdlib/source/documentation/lux/world.lux          |  4 +-
 stdlib/source/documentation/lux/world/console.lux  |  6 +--
 stdlib/source/documentation/lux/world/file.lux     |  6 +--
 .../source/documentation/lux/world/file/watch.lux  |  6 +--
 .../documentation/lux/world/input/keyboard.lux     | 26 +++++-----
 stdlib/source/documentation/lux/world/net.lux      | 28 +++++------
 .../documentation/lux/world/net/http/client.lux    |  6 +--
 .../documentation/lux/world/net/http/status.lux    | 26 +++++-----
 stdlib/source/documentation/lux/world/net/uri.lux  | 18 +++----
 .../lux/world/output/video/resolution.lux          |  6 +--
 stdlib/source/documentation/lux/world/program.lux  | 26 +++++-----
 stdlib/source/documentation/lux/world/shell.lux    |  6 +--
 201 files changed, 1563 insertions(+), 1563 deletions(-)

(limited to 'stdlib/source/documentation')

diff --git a/stdlib/source/documentation/lux.lux b/stdlib/source/documentation/lux.lux
index 468fc588f..2a65bf0dc 100644
--- a/stdlib/source/documentation/lux.lux
+++ b/stdlib/source/documentation/lux.lux
@@ -1,16 +1,16 @@
 (.using
  [library
   [lux
-   [program {"+" program:}]
-   ["$" documentation {"+" documentation:}]
+   [program (.only program:)]
+   ["$" documentation (.only documentation:)]
    ["[0]" debug]
    [control
     ["[0]" io]
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]
      ["[0]" set]]]
diff --git a/stdlib/source/documentation/lux/abstract.lux b/stdlib/source/documentation/lux/abstract.lux
index 7fd12c4a8..d7a2b8c1e 100644
--- a/stdlib/source/documentation/lux/abstract.lux
+++ b/stdlib/source/documentation/lux/abstract.lux
@@ -1,26 +1,26 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" apply]
-   ["[1][0]" codec]
-   ["[1][0]" comonad]
-   ["[1][0]" enum]
-   ["[1][0]" equivalence]
-   ["[1][0]" mix]
-   ["[1][0]" functor]
-   ["[1][0]" hash]
-   ["[1][0]" interval]
-   ["[1][0]" monad]
-   ["[1][0]" monoid]
-   ["[1][0]" order]
-   ["[1][0]" predicate]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" apply]
+  ["[1][0]" codec]
+  ["[1][0]" comonad]
+  ["[1][0]" enum]
+  ["[1][0]" equivalence]
+  ["[1][0]" mix]
+  ["[1][0]" functor]
+  ["[1][0]" hash]
+  ["[1][0]" interval]
+  ["[1][0]" monad]
+  ["[1][0]" monoid]
+  ["[1][0]" order]
+  ["[1][0]" predicate]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/abstract/apply.lux b/stdlib/source/documentation/lux/abstract/apply.lux
index 78193973c..7f18dbdc2 100644
--- a/stdlib/source/documentation/lux/abstract/apply.lux
+++ b/stdlib/source/documentation/lux/abstract/apply.lux
@@ -1,9 +1,9 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Apply f)
   "Applicative functors.")
diff --git a/stdlib/source/documentation/lux/abstract/codec.lux b/stdlib/source/documentation/lux/abstract/codec.lux
index d39113c45..630e0e504 100644
--- a/stdlib/source/documentation/lux/abstract/codec.lux
+++ b/stdlib/source/documentation/lux/abstract/codec.lux
@@ -1,7 +1,7 @@
 (.using
  [library
   [lux
-   ["$" documentation {"+" documentation:}]]]
+   ["$" documentation (.only documentation:)]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/documentation/lux/abstract/comonad.lux b/stdlib/source/documentation/lux/abstract/comonad.lux
index 50e308506..0c81013ff 100644
--- a/stdlib/source/documentation/lux/abstract/comonad.lux
+++ b/stdlib/source/documentation/lux/abstract/comonad.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" cofree]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" cofree]])
 
 (documentation: (/.CoMonad !)
   (format "Co-monads are the opposite/complement to monads."
diff --git a/stdlib/source/documentation/lux/abstract/comonad/cofree.lux b/stdlib/source/documentation/lux/abstract/comonad/cofree.lux
index 240845d28..644357230 100644
--- a/stdlib/source/documentation/lux/abstract/comonad/cofree.lux
+++ b/stdlib/source/documentation/lux/abstract/comonad/cofree.lux
@@ -1,9 +1,9 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.CoFree ! it)
   "The CoFree CoMonad.")
diff --git a/stdlib/source/documentation/lux/abstract/enum.lux b/stdlib/source/documentation/lux/abstract/enum.lux
index be60cf1df..225a36a1e 100644
--- a/stdlib/source/documentation/lux/abstract/enum.lux
+++ b/stdlib/source/documentation/lux/abstract/enum.lux
@@ -1,9 +1,9 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Enum it)
   "Enumerable types, with a notion of moving forward and backwards through a type's instances.")
diff --git a/stdlib/source/documentation/lux/abstract/equivalence.lux b/stdlib/source/documentation/lux/abstract/equivalence.lux
index 4c58fdcc5..558db3902 100644
--- a/stdlib/source/documentation/lux/abstract/equivalence.lux
+++ b/stdlib/source/documentation/lux/abstract/equivalence.lux
@@ -1,12 +1,12 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Equivalence it)
   "Equivalence for a type's instances.")
diff --git a/stdlib/source/documentation/lux/abstract/functor.lux b/stdlib/source/documentation/lux/abstract/functor.lux
index 92c0a61c9..837dba3e6 100644
--- a/stdlib/source/documentation/lux/abstract/functor.lux
+++ b/stdlib/source/documentation/lux/abstract/functor.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
  [\\library
   ["[0]" /]]
  ["[0]" / "_"
diff --git a/stdlib/source/documentation/lux/abstract/functor/contravariant.lux b/stdlib/source/documentation/lux/abstract/functor/contravariant.lux
index 625dfee00..72c873f4c 100644
--- a/stdlib/source/documentation/lux/abstract/functor/contravariant.lux
+++ b/stdlib/source/documentation/lux/abstract/functor/contravariant.lux
@@ -1,9 +1,9 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Functor !)
   "The contravariant functor.")
diff --git a/stdlib/source/documentation/lux/abstract/hash.lux b/stdlib/source/documentation/lux/abstract/hash.lux
index 46cf611a1..b227175c2 100644
--- a/stdlib/source/documentation/lux/abstract/hash.lux
+++ b/stdlib/source/documentation/lux/abstract/hash.lux
@@ -1,12 +1,12 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Hash it)
   "A way to produce hash-codes for a type's instances.")
diff --git a/stdlib/source/documentation/lux/abstract/interval.lux b/stdlib/source/documentation/lux/abstract/interval.lux
index cccd26b9b..57cc874ac 100644
--- a/stdlib/source/documentation/lux/abstract/interval.lux
+++ b/stdlib/source/documentation/lux/abstract/interval.lux
@@ -1,12 +1,12 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Interval it)
   "A representation of top and bottom boundaries for an ordered type.")
diff --git a/stdlib/source/documentation/lux/abstract/mix.lux b/stdlib/source/documentation/lux/abstract/mix.lux
index b43b815b9..883ebf27f 100644
--- a/stdlib/source/documentation/lux/abstract/mix.lux
+++ b/stdlib/source/documentation/lux/abstract/mix.lux
@@ -1,12 +1,12 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Mix structure)
   "Iterate over a structure's values to build a summary value.")
diff --git a/stdlib/source/documentation/lux/abstract/monad.lux b/stdlib/source/documentation/lux/abstract/monad.lux
index cac36742b..6134bceda 100644
--- a/stdlib/source/documentation/lux/abstract/monad.lux
+++ b/stdlib/source/documentation/lux/abstract/monad.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" free]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" free]])
 
 (documentation: (/.Monad it)
   (format "A monad is a monoid in the category of endofunctors."
diff --git a/stdlib/source/documentation/lux/abstract/monad/free.lux b/stdlib/source/documentation/lux/abstract/monad/free.lux
index 7faa07400..fc97271f6 100644
--- a/stdlib/source/documentation/lux/abstract/monad/free.lux
+++ b/stdlib/source/documentation/lux/abstract/monad/free.lux
@@ -1,9 +1,9 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Free ! it)
   "The Free Monad.")
diff --git a/stdlib/source/documentation/lux/abstract/monoid.lux b/stdlib/source/documentation/lux/abstract/monoid.lux
index 08a0903ec..ea6043c5b 100644
--- a/stdlib/source/documentation/lux/abstract/monoid.lux
+++ b/stdlib/source/documentation/lux/abstract/monoid.lux
@@ -1,12 +1,12 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Monoid it)
   (format "A way to compose values."
diff --git a/stdlib/source/documentation/lux/abstract/order.lux b/stdlib/source/documentation/lux/abstract/order.lux
index 85a72995f..d1c63844c 100644
--- a/stdlib/source/documentation/lux/abstract/order.lux
+++ b/stdlib/source/documentation/lux/abstract/order.lux
@@ -1,12 +1,12 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Order it)
   "A signature for types that possess some sense of ordering among their elements.")
diff --git a/stdlib/source/documentation/lux/abstract/predicate.lux b/stdlib/source/documentation/lux/abstract/predicate.lux
index 36956c8e2..d75b19959 100644
--- a/stdlib/source/documentation/lux/abstract/predicate.lux
+++ b/stdlib/source/documentation/lux/abstract/predicate.lux
@@ -1,12 +1,12 @@
 (.using
-  [library
-   [lux
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Predicate it)
   "A question that can be asked of a value, yield either false (#0) or true (#1).")
diff --git a/stdlib/source/documentation/lux/control.lux b/stdlib/source/documentation/lux/control.lux
index afb68da76..7ca840dfc 100644
--- a/stdlib/source/documentation/lux/control.lux
+++ b/stdlib/source/documentation/lux/control.lux
@@ -1,32 +1,32 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" concatenative]
-   ["[1][0]" concurrency]
-   ["[1][0]" continuation]
-   ["[1][0]" exception]
-   ["[1][0]" function]
-   ["[1][0]" io]
-   ["[1][0]" lazy]
-   ["[1][0]" maybe]
-   ["[1][0]" parser]
-   ["[1][0]" pipe]
-   ["[1][0]" reader]
-   ["[1][0]" region]
-   ["[1][0]" remember]
-   ["[1][0]" security]
-   ["[1][0]" state]
-   ["[1][0]" thread]
-   ["[1][0]" try]
-   ["[1][0]" writer]
-   ])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" concatenative]
+  ["[1][0]" concurrency]
+  ["[1][0]" continuation]
+  ["[1][0]" exception]
+  ["[1][0]" function]
+  ["[1][0]" io]
+  ["[1][0]" lazy]
+  ["[1][0]" maybe]
+  ["[1][0]" parser]
+  ["[1][0]" pipe]
+  ["[1][0]" reader]
+  ["[1][0]" region]
+  ["[1][0]" remember]
+  ["[1][0]" security]
+  ["[1][0]" state]
+  ["[1][0]" thread]
+  ["[1][0]" try]
+  ["[1][0]" writer]
+  ])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/control/concatenative.lux b/stdlib/source/documentation/lux/control/concatenative.lux
index d56a9f513..f1ea0d4bc 100644
--- a/stdlib/source/documentation/lux/control/concatenative.lux
+++ b/stdlib/source/documentation/lux/control/concatenative.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" if loop}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
     [text
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]
    [math
diff --git a/stdlib/source/documentation/lux/control/concurrency.lux b/stdlib/source/documentation/lux/control/concurrency.lux
index 2980874f5..5e308ee43 100644
--- a/stdlib/source/documentation/lux/control/concurrency.lux
+++ b/stdlib/source/documentation/lux/control/concurrency.lux
@@ -1,20 +1,20 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" actor]
-   ["[1][0]" async]
-   ["[1][0]" atom]
-   ["[1][0]" frp]
-   ["[1][0]" semaphore]
-   ["[1][0]" stm]
-   ["[1][0]" thread]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" actor]
+  ["[1][0]" async]
+  ["[1][0]" atom]
+  ["[1][0]" frp]
+  ["[1][0]" semaphore]
+  ["[1][0]" stm]
+  ["[1][0]" thread]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/control/concurrency/actor.lux b/stdlib/source/documentation/lux/control/concurrency/actor.lux
index 4a7199952..4485be388 100644
--- a/stdlib/source/documentation/lux/control/concurrency/actor.lux
+++ b/stdlib/source/documentation/lux/control/concurrency/actor.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" if loop}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/concurrency/async.lux b/stdlib/source/documentation/lux/control/concurrency/async.lux
index d060b0ca3..79bf0838a 100644
--- a/stdlib/source/documentation/lux/control/concurrency/async.lux
+++ b/stdlib/source/documentation/lux/control/concurrency/async.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" or and}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" or and}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Async it)
   "Represents values produced by asynchronous computations (unlike IO, which is synchronous).")
diff --git a/stdlib/source/documentation/lux/control/concurrency/atom.lux b/stdlib/source/documentation/lux/control/concurrency/atom.lux
index 205f5c9dc..674f621ec 100644
--- a/stdlib/source/documentation/lux/control/concurrency/atom.lux
+++ b/stdlib/source/documentation/lux/control/concurrency/atom.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Atom it)
   "Atomic references that are safe to mutate concurrently.")
diff --git a/stdlib/source/documentation/lux/control/concurrency/frp.lux b/stdlib/source/documentation/lux/control/concurrency/frp.lux
index 563177e1a..d896d96ee 100644
--- a/stdlib/source/documentation/lux/control/concurrency/frp.lux
+++ b/stdlib/source/documentation/lux/control/concurrency/frp.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Channel it)
   "An asynchronous channel to distribute values.")
diff --git a/stdlib/source/documentation/lux/control/concurrency/semaphore.lux b/stdlib/source/documentation/lux/control/concurrency/semaphore.lux
index b13c8fe49..d5ba9d84b 100644
--- a/stdlib/source/documentation/lux/control/concurrency/semaphore.lux
+++ b/stdlib/source/documentation/lux/control/concurrency/semaphore.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Semaphore
   "A tool for controlling access to resources by multiple concurrent processes.")
diff --git a/stdlib/source/documentation/lux/control/concurrency/stm.lux b/stdlib/source/documentation/lux/control/concurrency/stm.lux
index 1d2c75baa..2d77deac8 100644
--- a/stdlib/source/documentation/lux/control/concurrency/stm.lux
+++ b/stdlib/source/documentation/lux/control/concurrency/stm.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" if loop}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/concurrency/thread.lux b/stdlib/source/documentation/lux/control/concurrency/thread.lux
index b085383aa..41060e6f0 100644
--- a/stdlib/source/documentation/lux/control/concurrency/thread.lux
+++ b/stdlib/source/documentation/lux/control/concurrency/thread.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.parallelism
   "How many processes can run in parallel.")
diff --git a/stdlib/source/documentation/lux/control/continuation.lux b/stdlib/source/documentation/lux/control/continuation.lux
index 42dec462f..13320a6fc 100644
--- a/stdlib/source/documentation/lux/control/continuation.lux
+++ b/stdlib/source/documentation/lux/control/continuation.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Cont input output)
   "Continuations.")
diff --git a/stdlib/source/documentation/lux/control/exception.lux b/stdlib/source/documentation/lux/control/exception.lux
index 96e970156..df5c09066 100644
--- a/stdlib/source/documentation/lux/control/exception.lux
+++ b/stdlib/source/documentation/lux/control/exception.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" if loop}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/function.lux b/stdlib/source/documentation/lux/control/function.lux
index 8213b2616..0dac18b26 100644
--- a/stdlib/source/documentation/lux/control/function.lux
+++ b/stdlib/source/documentation/lux/control/function.lux
@@ -1,19 +1,19 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" contract]
-   ["[1][0]" memo]
-   ["[1][0]" mixin]
-   ["[1][0]" mutual]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" contract]
+  ["[1][0]" memo]
+  ["[1][0]" mixin]
+  ["[1][0]" mutual]])
 
 (documentation: /.identity
   (format "Identity function."
diff --git a/stdlib/source/documentation/lux/control/function/contract.lux b/stdlib/source/documentation/lux/control/function/contract.lux
index 62aff3670..f57997793 100644
--- a/stdlib/source/documentation/lux/control/function/contract.lux
+++ b/stdlib/source/documentation/lux/control/function/contract.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.pre
   (format "Pre-conditions."
diff --git a/stdlib/source/documentation/lux/control/function/memo.lux b/stdlib/source/documentation/lux/control/function/memo.lux
index 9baa0d1a7..0f07fdf33 100644
--- a/stdlib/source/documentation/lux/control/function/memo.lux
+++ b/stdlib/source/documentation/lux/control/function/memo.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" open}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/function/mixin.lux b/stdlib/source/documentation/lux/control/function/mixin.lux
index 83ecbaac1..c6ddcf3c5 100644
--- a/stdlib/source/documentation/lux/control/function/mixin.lux
+++ b/stdlib/source/documentation/lux/control/function/mixin.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Mixin input output)
   "A partially-defined function which can be mixed with others to inherit their behavior.")
diff --git a/stdlib/source/documentation/lux/control/function/mutual.lux b/stdlib/source/documentation/lux/control/function/mutual.lux
index 732db8308..2568fd4a5 100644
--- a/stdlib/source/documentation/lux/control/function/mutual.lux
+++ b/stdlib/source/documentation/lux/control/function/mutual.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" let def:}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" let def:}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.let
   "Locally-defined mutually-recursive functions."
diff --git a/stdlib/source/documentation/lux/control/io.lux b/stdlib/source/documentation/lux/control/io.lux
index 6dc82c1e1..a5ff21915 100644
--- a/stdlib/source/documentation/lux/control/io.lux
+++ b/stdlib/source/documentation/lux/control/io.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.IO it)
   "A type that represents synchronous, effectful computations that may interact with the outside world.")
diff --git a/stdlib/source/documentation/lux/control/lazy.lux b/stdlib/source/documentation/lux/control/lazy.lux
index fe4950b12..bfb83290c 100644
--- a/stdlib/source/documentation/lux/control/lazy.lux
+++ b/stdlib/source/documentation/lux/control/lazy.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Lazy it)
   (format "A value specified by an expression that is calculated only at the last moment possible."
diff --git a/stdlib/source/documentation/lux/control/maybe.lux b/stdlib/source/documentation/lux/control/maybe.lux
index be14998dc..00923d380 100644
--- a/stdlib/source/documentation/lux/control/maybe.lux
+++ b/stdlib/source/documentation/lux/control/maybe.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.lifted
   "Wraps a monadic value with Maybe machinery."
diff --git a/stdlib/source/documentation/lux/control/parser.lux b/stdlib/source/documentation/lux/control/parser.lux
index 7dcfbbaf6..15817f391 100644
--- a/stdlib/source/documentation/lux/control/parser.lux
+++ b/stdlib/source/documentation/lux/control/parser.lux
@@ -1,26 +1,26 @@
 (.using
-  [library
-   [lux {"-" or and not}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" analysis]
-   ["[1][0]" binary]
-   ["[1][0]" cli]
-   ["[1][0]" code]
-   ["[1][0]" environment]
-   ["[1][0]" json]
-   ["[1][0]" synthesis]
-   ["[1][0]" text]
-   ["[1][0]" tree]
-   ["[1][0]" type]
-   ["[1][0]" xml]])
+ [library
+  [lux {"-" or and not}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" analysis]
+  ["[1][0]" binary]
+  ["[1][0]" cli]
+  ["[1][0]" code]
+  ["[1][0]" environment]
+  ["[1][0]" json]
+  ["[1][0]" synthesis]
+  ["[1][0]" text]
+  ["[1][0]" tree]
+  ["[1][0]" type]
+  ["[1][0]" xml]])
 
 (documentation: (/.Parser state it)
   "A generic parser.")
diff --git a/stdlib/source/documentation/lux/control/parser/analysis.lux b/stdlib/source/documentation/lux/control/parser/analysis.lux
index aa4542f2d..493a21e3a 100644
--- a/stdlib/source/documentation/lux/control/parser/analysis.lux
+++ b/stdlib/source/documentation/lux/control/parser/analysis.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" nat int rev local}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/parser/binary.lux b/stdlib/source/documentation/lux/control/parser/binary.lux
index 0a163f2a8..746e9fcee 100644
--- a/stdlib/source/documentation/lux/control/parser/binary.lux
+++ b/stdlib/source/documentation/lux/control/parser/binary.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" list}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/parser/cli.lux b/stdlib/source/documentation/lux/control/parser/cli.lux
index 1ef937a0b..f20d3a686 100644
--- a/stdlib/source/documentation/lux/control/parser/cli.lux
+++ b/stdlib/source/documentation/lux/control/parser/cli.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" parameter}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/parser/code.lux b/stdlib/source/documentation/lux/control/parser/code.lux
index 552738c03..b0336ce13 100644
--- a/stdlib/source/documentation/lux/control/parser/code.lux
+++ b/stdlib/source/documentation/lux/control/parser/code.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" nat int rev local not symbol}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/parser/environment.lux b/stdlib/source/documentation/lux/control/parser/environment.lux
index 9d99d77df..b27b0bff8 100644
--- a/stdlib/source/documentation/lux/control/parser/environment.lux
+++ b/stdlib/source/documentation/lux/control/parser/environment.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Property
   "A property in the environment.")
diff --git a/stdlib/source/documentation/lux/control/parser/json.lux b/stdlib/source/documentation/lux/control/parser/json.lux
index 714fd3326..0404d2227 100644
--- a/stdlib/source/documentation/lux/control/parser/json.lux
+++ b/stdlib/source/documentation/lux/control/parser/json.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/parser/synthesis.lux b/stdlib/source/documentation/lux/control/parser/synthesis.lux
index 498b88d96..1420d65ec 100644
--- a/stdlib/source/documentation/lux/control/parser/synthesis.lux
+++ b/stdlib/source/documentation/lux/control/parser/synthesis.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" i64 local function loop}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/parser/text.lux b/stdlib/source/documentation/lux/control/parser/text.lux
index 1859f451c..581c04668 100644
--- a/stdlib/source/documentation/lux/control/parser/text.lux
+++ b/stdlib/source/documentation/lux/control/parser/text.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" and not local}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/parser/tree.lux b/stdlib/source/documentation/lux/control/parser/tree.lux
index 282fcc7af..42c51b68a 100644
--- a/stdlib/source/documentation/lux/control/parser/tree.lux
+++ b/stdlib/source/documentation/lux/control/parser/tree.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" left right}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/parser/type.lux b/stdlib/source/documentation/lux/control/parser/type.lux
index b240b24ad..7f4858310 100644
--- a/stdlib/source/documentation/lux/control/parser/type.lux
+++ b/stdlib/source/documentation/lux/control/parser/type.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" local function}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/parser/xml.lux b/stdlib/source/documentation/lux/control/parser/xml.lux
index 44cb9f663..c286b18a1 100644
--- a/stdlib/source/documentation/lux/control/parser/xml.lux
+++ b/stdlib/source/documentation/lux/control/parser/xml.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Parser it)
   "A parser of XML-encoded data.")
diff --git a/stdlib/source/documentation/lux/control/pipe.lux b/stdlib/source/documentation/lux/control/pipe.lux
index ae6c1e740..e2d58f76e 100644
--- a/stdlib/source/documentation/lux/control/pipe.lux
+++ b/stdlib/source/documentation/lux/control/pipe.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" let cond if exec case}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/reader.lux b/stdlib/source/documentation/lux/control/reader.lux
index 909f8bf59..5e3991942 100644
--- a/stdlib/source/documentation/lux/control/reader.lux
+++ b/stdlib/source/documentation/lux/control/reader.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" local}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" local}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Reader environment it)
   "Computations that have access to some environmental value.")
diff --git a/stdlib/source/documentation/lux/control/region.lux b/stdlib/source/documentation/lux/control/region.lux
index 3ea4361f5..9b6574ef3 100644
--- a/stdlib/source/documentation/lux/control/region.lux
+++ b/stdlib/source/documentation/lux/control/region.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" if loop}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" if loop}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Region r ! it)
   (format "A region where resources may be be claimed and where a side-effecting computation may be performed."
diff --git a/stdlib/source/documentation/lux/control/remember.lux b/stdlib/source/documentation/lux/control/remember.lux
index f19ef860d..6008acd0b 100644
--- a/stdlib/source/documentation/lux/control/remember.lux
+++ b/stdlib/source/documentation/lux/control/remember.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.remember
   (format "A message with an expiration date."
diff --git a/stdlib/source/documentation/lux/control/security.lux b/stdlib/source/documentation/lux/control/security.lux
index e88b60028..d43a54228 100644
--- a/stdlib/source/documentation/lux/control/security.lux
+++ b/stdlib/source/documentation/lux/control/security.lux
@@ -1,15 +1,15 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" capability]
-   ["[1][0]" policy]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" capability]
+  ["[1][0]" policy]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/control/security/capability.lux b/stdlib/source/documentation/lux/control/security/capability.lux
index 6acef6829..f29b5f8a9 100644
--- a/stdlib/source/documentation/lux/control/security/capability.lux
+++ b/stdlib/source/documentation/lux/control/security/capability.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Capability brand input output)
   (format "Represents the capability to perform an operation."
diff --git a/stdlib/source/documentation/lux/control/security/policy.lux b/stdlib/source/documentation/lux/control/security/policy.lux
index 2a373f04c..d9243d7ad 100644
--- a/stdlib/source/documentation/lux/control/security/policy.lux
+++ b/stdlib/source/documentation/lux/control/security/policy.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/control/state.lux b/stdlib/source/documentation/lux/control/state.lux
index dc1d9effd..316748cd9 100644
--- a/stdlib/source/documentation/lux/control/state.lux
+++ b/stdlib/source/documentation/lux/control/state.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" local}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" local}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.State state it)
   "Stateful computations.")
diff --git a/stdlib/source/documentation/lux/control/thread.lux b/stdlib/source/documentation/lux/control/thread.lux
index c67998e1d..1b08487c4 100644
--- a/stdlib/source/documentation/lux/control/thread.lux
+++ b/stdlib/source/documentation/lux/control/thread.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" local}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" local}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Thread ! it)
   "An imperative process with access to mutable values.")
diff --git a/stdlib/source/documentation/lux/control/try.lux b/stdlib/source/documentation/lux/control/try.lux
index b2a586bf0..61147f884 100644
--- a/stdlib/source/documentation/lux/control/try.lux
+++ b/stdlib/source/documentation/lux/control/try.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" local}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" local}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Try it)
   "A computation that can fail with an error message.")
diff --git a/stdlib/source/documentation/lux/control/writer.lux b/stdlib/source/documentation/lux/control/writer.lux
index b786c25ee..535e856e0 100644
--- a/stdlib/source/documentation/lux/control/writer.lux
+++ b/stdlib/source/documentation/lux/control/writer.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" local}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" local}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Writer log value)
   "Represents a value with an associated 'log' to record arbitrary information.")
diff --git a/stdlib/source/documentation/lux/data.lux b/stdlib/source/documentation/lux/data.lux
index e9cf6e827..2379b4653 100644
--- a/stdlib/source/documentation/lux/data.lux
+++ b/stdlib/source/documentation/lux/data.lux
@@ -1,22 +1,22 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" binary]
-   ["[1][0]" bit]
-   ["[1][0]" collection]
-   ["[1][0]" color]
-   ["[1][0]" format]
-   ["[1][0]" identity]
-   ["[1][0]" product]
-   ["[1][0]" sum]
-   ["[1][0]" text]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" binary]
+  ["[1][0]" bit]
+  ["[1][0]" collection]
+  ["[1][0]" color]
+  ["[1][0]" format]
+  ["[1][0]" identity]
+  ["[1][0]" product]
+  ["[1][0]" sum]
+  ["[1][0]" text]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/data/binary.lux b/stdlib/source/documentation/lux/data/binary.lux
index ecf9bba44..3e3b50999 100644
--- a/stdlib/source/documentation/lux/data/binary.lux
+++ b/stdlib/source/documentation/lux/data/binary.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/bit.lux b/stdlib/source/documentation/lux/data/bit.lux
index 4ae895893..757cbea9f 100644
--- a/stdlib/source/documentation/lux/data/bit.lux
+++ b/stdlib/source/documentation/lux/data/bit.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.complement
   (format "Generates the complement of a predicate."
diff --git a/stdlib/source/documentation/lux/data/collection.lux b/stdlib/source/documentation/lux/data/collection.lux
index 9928cbe3e..ce9b1b1d3 100644
--- a/stdlib/source/documentation/lux/data/collection.lux
+++ b/stdlib/source/documentation/lux/data/collection.lux
@@ -1,23 +1,23 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" array]
-   ["[1][0]" bits]
-   ["[1][0]" dictionary]
-   ["[1][0]" list]
-   ["[1][0]" queue]
-   ["[1][0]" sequence]
-   ["[1][0]" stream]
-   ["[1][0]" stack]
-   ["[1][0]" set]
-   ["[1][0]" tree]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" array]
+  ["[1][0]" bits]
+  ["[1][0]" dictionary]
+  ["[1][0]" list]
+  ["[1][0]" queue]
+  ["[1][0]" sequence]
+  ["[1][0]" stream]
+  ["[1][0]" stack]
+  ["[1][0]" set]
+  ["[1][0]" tree]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/data/collection/array.lux b/stdlib/source/documentation/lux/data/collection/array.lux
index d516f1ec3..d89589979 100644
--- a/stdlib/source/documentation/lux/data/collection/array.lux
+++ b/stdlib/source/documentation/lux/data/collection/array.lux
@@ -1,19 +1,19 @@
 (.using
-  [library
-   [lux {"-" list}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" list}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    [syntax (.only syntax:)]
+    ["[0]" code]
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Array it)
   "Mutable arrays.")
diff --git a/stdlib/source/documentation/lux/data/collection/bits.lux b/stdlib/source/documentation/lux/data/collection/bits.lux
index 7b1438405..d9c23a672 100644
--- a/stdlib/source/documentation/lux/data/collection/bits.lux
+++ b/stdlib/source/documentation/lux/data/collection/bits.lux
@@ -1,19 +1,19 @@
 (.using
-  [library
-   [lux {"-" or and not}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" or and not}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    [syntax (.only syntax:)]
+    ["[0]" code]
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Bits
   "A bit-map.")
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary.lux b/stdlib/source/documentation/lux/data/collection/dictionary.lux
index 80e23fc70..90884cad9 100644
--- a/stdlib/source/documentation/lux/data/collection/dictionary.lux
+++ b/stdlib/source/documentation/lux/data/collection/dictionary.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux {"-" has revised}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux b/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
index e597d73fa..b0bf3f97d 100644
--- a/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux {"-" has revised}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary/plist.lux b/stdlib/source/documentation/lux/data/collection/dictionary/plist.lux
index 81ca8e29c..88a24b0f0 100644
--- a/stdlib/source/documentation/lux/data/collection/dictionary/plist.lux
+++ b/stdlib/source/documentation/lux/data/collection/dictionary/plist.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux {"-" has revised}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/list.lux b/stdlib/source/documentation/lux/data/collection/list.lux
index 459e1f8c9..acd54eaab 100644
--- a/stdlib/source/documentation/lux/data/collection/list.lux
+++ b/stdlib/source/documentation/lux/data/collection/list.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux {"-" all}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/queue.lux b/stdlib/source/documentation/lux/data/collection/queue.lux
index db9dbf22d..a9e243dce 100644
--- a/stdlib/source/documentation/lux/data/collection/queue.lux
+++ b/stdlib/source/documentation/lux/data/collection/queue.lux
@@ -1,21 +1,21 @@
 (.using
-  [library
-   [lux {"-" list}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" priority]])
+ [library
+  [lux {"-" list}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    [syntax (.only syntax:)]
+    ["[0]" code]
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" priority]])
 
 (documentation: (/.Queue it)
   "A first-in, first-out sequential data-structure.")
diff --git a/stdlib/source/documentation/lux/data/collection/queue/priority.lux b/stdlib/source/documentation/lux/data/collection/queue/priority.lux
index 2d75d2405..37030d30a 100644
--- a/stdlib/source/documentation/lux/data/collection/queue/priority.lux
+++ b/stdlib/source/documentation/lux/data/collection/queue/priority.lux
@@ -1,19 +1,19 @@
 (.using
-  [library
-   [lux {"-" list}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" list}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    [syntax (.only syntax:)]
+    ["[0]" code]
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.member?
   ""
diff --git a/stdlib/source/documentation/lux/data/collection/sequence.lux b/stdlib/source/documentation/lux/data/collection/sequence.lux
index 3f25a8a2b..13521af1c 100644
--- a/stdlib/source/documentation/lux/data/collection/sequence.lux
+++ b/stdlib/source/documentation/lux/data/collection/sequence.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux {"-" list has revised}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/set.lux b/stdlib/source/documentation/lux/data/collection/set.lux
index afac731cb..7b0e2e838 100644
--- a/stdlib/source/documentation/lux/data/collection/set.lux
+++ b/stdlib/source/documentation/lux/data/collection/set.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" list has}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/set/multi.lux b/stdlib/source/documentation/lux/data/collection/set/multi.lux
index 40c11a4d0..ec0e44e6f 100644
--- a/stdlib/source/documentation/lux/data/collection/set/multi.lux
+++ b/stdlib/source/documentation/lux/data/collection/set/multi.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" list has}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/set/ordered.lux b/stdlib/source/documentation/lux/data/collection/set/ordered.lux
index c239a9b35..1664a6683 100644
--- a/stdlib/source/documentation/lux/data/collection/set/ordered.lux
+++ b/stdlib/source/documentation/lux/data/collection/set/ordered.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" list has}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/stack.lux b/stdlib/source/documentation/lux/data/collection/stack.lux
index b66f00e58..f5b8626e3 100644
--- a/stdlib/source/documentation/lux/data/collection/stack.lux
+++ b/stdlib/source/documentation/lux/data/collection/stack.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" list}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" list}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Stack it)
   "A first-in, last-out sequential data-structure.")
diff --git a/stdlib/source/documentation/lux/data/collection/stream.lux b/stdlib/source/documentation/lux/data/collection/stream.lux
index bba416ae1..942772a3f 100644
--- a/stdlib/source/documentation/lux/data/collection/stream.lux
+++ b/stdlib/source/documentation/lux/data/collection/stream.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux {"-" list pattern}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/tree.lux b/stdlib/source/documentation/lux/data/collection/tree.lux
index f4287d194..bd39bb4e5 100644
--- a/stdlib/source/documentation/lux/data/collection/tree.lux
+++ b/stdlib/source/documentation/lux/data/collection/tree.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" list}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/tree/finger.lux b/stdlib/source/documentation/lux/data/collection/tree/finger.lux
index 6925c9667..ea3e6d859 100644
--- a/stdlib/source/documentation/lux/data/collection/tree/finger.lux
+++ b/stdlib/source/documentation/lux/data/collection/tree/finger.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" list}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" list}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Tree @ tag value)
   "A finger tree.")
diff --git a/stdlib/source/documentation/lux/data/collection/tree/zipper.lux b/stdlib/source/documentation/lux/data/collection/tree/zipper.lux
index 6a9fdf3e0..505be963f 100644
--- a/stdlib/source/documentation/lux/data/collection/tree/zipper.lux
+++ b/stdlib/source/documentation/lux/data/collection/tree/zipper.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" list}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" list}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Zipper it)
   "Tree zippers, for easy navigation and editing of trees.")
diff --git a/stdlib/source/documentation/lux/data/color.lux b/stdlib/source/documentation/lux/data/color.lux
index ca2a4c430..b7bb52100 100644
--- a/stdlib/source/documentation/lux/data/color.lux
+++ b/stdlib/source/documentation/lux/data/color.lux
@@ -1,21 +1,21 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" named]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    [syntax (.only syntax:)]
+    ["[0]" code]
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" named]])
 
 (documentation: /.RGB
   "Red-Green-Blue color format.")
diff --git a/stdlib/source/documentation/lux/data/color/named.lux b/stdlib/source/documentation/lux/data/color/named.lux
index 0dd397b41..77ab94ea8 100644
--- a/stdlib/source/documentation/lux/data/color/named.lux
+++ b/stdlib/source/documentation/lux/data/color/named.lux
@@ -1,23 +1,23 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text
-      ["%" format {"+" format}]]]
-    [macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]
-     ["[0]" template]]
-    [math
-     [number
-      ["[0]" nat ("hex#[0]" hex)]]]]]
-  [\\library
-   ["[0]" /
-    ["/[1]" //]]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text
+     ["%" format (.only format)]]]
+   [macro
+    [syntax (.only syntax:)]
+    ["[0]" code]
+    ["[0]" template]]
+   [math
+    [number
+     ["[0]" nat ("hex#[0]" hex)]]]]]
+ [\\library
+  ["[0]" /
+   ["/[1]" //]]])
 
 (template [<name>]
   [(documentation: <name>
diff --git a/stdlib/source/documentation/lux/data/format.lux b/stdlib/source/documentation/lux/data/format.lux
index bc1013057..d1f9a7627 100644
--- a/stdlib/source/documentation/lux/data/format.lux
+++ b/stdlib/source/documentation/lux/data/format.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" binary]
-   ["[1][0]" json]
-   ["[1][0]" tar]
-   ["[1][0]" xml]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" binary]
+  ["[1][0]" json]
+  ["[1][0]" tar]
+  ["[1][0]" xml]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/data/format/binary.lux b/stdlib/source/documentation/lux/data/format/binary.lux
index 497de2dba..e0d2bc7fe 100644
--- a/stdlib/source/documentation/lux/data/format/binary.lux
+++ b/stdlib/source/documentation/lux/data/format/binary.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" nat int rev list type or and symbol}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/format/json.lux b/stdlib/source/documentation/lux/data/format/json.lux
index 78e8bd332..ea0cb0663 100644
--- a/stdlib/source/documentation/lux/data/format/json.lux
+++ b/stdlib/source/documentation/lux/data/format/json.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" nat int rev list type or and has}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/format/tar.lux b/stdlib/source/documentation/lux/data/format/tar.lux
index df4e17788..dc4ef6c7f 100644
--- a/stdlib/source/documentation/lux/data/format/tar.lux
+++ b/stdlib/source/documentation/lux/data/format/tar.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/format/xml.lux b/stdlib/source/documentation/lux/data/format/xml.lux
index 3678f3474..ec9df6b04 100644
--- a/stdlib/source/documentation/lux/data/format/xml.lux
+++ b/stdlib/source/documentation/lux/data/format/xml.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" nat int rev list type or and}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" nat int rev list type or and}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.attributes
   "An empty set of XML attributes.")
diff --git a/stdlib/source/documentation/lux/data/identity.lux b/stdlib/source/documentation/lux/data/identity.lux
index 4af4c2236..a6f587da4 100644
--- a/stdlib/source/documentation/lux/data/identity.lux
+++ b/stdlib/source/documentation/lux/data/identity.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" nat int rev list type or and}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" nat int rev list type or and}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Identity it)
   "A value, as is, without any extra structure super-imposed on it.")
diff --git a/stdlib/source/documentation/lux/data/product.lux b/stdlib/source/documentation/lux/data/product.lux
index a437421f5..9e1a87faa 100644
--- a/stdlib/source/documentation/lux/data/product.lux
+++ b/stdlib/source/documentation/lux/data/product.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" left right}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
     [text
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/sum.lux b/stdlib/source/documentation/lux/data/sum.lux
index 8d4a1edc5..fd5125489 100644
--- a/stdlib/source/documentation/lux/data/sum.lux
+++ b/stdlib/source/documentation/lux/data/sum.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" left right}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/text.lux b/stdlib/source/documentation/lux/data/text.lux
index 94886667c..53411a89b 100644
--- a/stdlib/source/documentation/lux/data/text.lux
+++ b/stdlib/source/documentation/lux/data/text.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
     [text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  ["[0]" / "_"
diff --git a/stdlib/source/documentation/lux/data/text/buffer.lux b/stdlib/source/documentation/lux/data/text/buffer.lux
index dc55213ed..9f30c4597 100644
--- a/stdlib/source/documentation/lux/data/text/buffer.lux
+++ b/stdlib/source/documentation/lux/data/text/buffer.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Buffer
   "Immutable text buffer for efficient text concatenation.")
diff --git a/stdlib/source/documentation/lux/data/text/encoding.lux b/stdlib/source/documentation/lux/data/text/encoding.lux
index c24126db7..93849025c 100644
--- a/stdlib/source/documentation/lux/data/text/encoding.lux
+++ b/stdlib/source/documentation/lux/data/text/encoding.lux
@@ -1,16 +1,16 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" utf8]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" utf8]])
 
 (documentation: /.Encoding
   "Encoding formats for text.")
diff --git a/stdlib/source/documentation/lux/data/text/encoding/utf8.lux b/stdlib/source/documentation/lux/data/text/encoding/utf8.lux
index dd1fed946..bac1da966 100644
--- a/stdlib/source/documentation/lux/data/text/encoding/utf8.lux
+++ b/stdlib/source/documentation/lux/data/text/encoding/utf8.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.codec
   "A codec for binary encoding of text as UTF-8.")
diff --git a/stdlib/source/documentation/lux/data/text/escape.lux b/stdlib/source/documentation/lux/data/text/escape.lux
index a4944b1f4..562720a22 100644
--- a/stdlib/source/documentation/lux/data/text/escape.lux
+++ b/stdlib/source/documentation/lux/data/text/escape.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.escaped
   "Yields a escaped version of the text."
diff --git a/stdlib/source/documentation/lux/data/text/format.lux b/stdlib/source/documentation/lux/data/text/format.lux
index 7cf561034..b188c4f83 100644
--- a/stdlib/source/documentation/lux/data/text/format.lux
+++ b/stdlib/source/documentation/lux/data/text/format.lux
@@ -1,7 +1,7 @@
 (.using
  [library
   [lux {"-" nat int rev type list symbol}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/text/regex.lux b/stdlib/source/documentation/lux/data/text/regex.lux
index 1fb81532e..7184e5a93 100644
--- a/stdlib/source/documentation/lux/data/text/regex.lux
+++ b/stdlib/source/documentation/lux/data/text/regex.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" pattern}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]]
+    [text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/text/unicode.lux b/stdlib/source/documentation/lux/data/text/unicode.lux
index f8ffbb93d..353678568 100644
--- a/stdlib/source/documentation/lux/data/text/unicode.lux
+++ b/stdlib/source/documentation/lux/data/text/unicode.lux
@@ -1,15 +1,15 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" block]
-   ["[1][0]" set]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" block]
+  ["[1][0]" set]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/data/text/unicode/block.lux b/stdlib/source/documentation/lux/data/text/unicode/block.lux
index 422cb77b9..058fc78ad 100644
--- a/stdlib/source/documentation/lux/data/text/unicode/block.lux
+++ b/stdlib/source/documentation/lux/data/text/unicode/block.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
     ["[0]" text
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]
    [math
diff --git a/stdlib/source/documentation/lux/data/text/unicode/set.lux b/stdlib/source/documentation/lux/data/text/unicode/set.lux
index 9e14f0802..02aade7f3 100644
--- a/stdlib/source/documentation/lux/data/text/unicode/set.lux
+++ b/stdlib/source/documentation/lux/data/text/unicode/set.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
     [text
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/debug.lux b/stdlib/source/documentation/lux/debug.lux
index f40a14bde..9e41684fa 100644
--- a/stdlib/source/documentation/lux/debug.lux
+++ b/stdlib/source/documentation/lux/debug.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" private}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/documentation.lux b/stdlib/source/documentation/lux/documentation.lux
index f1ba6db85..05ac9b9a2 100644
--- a/stdlib/source/documentation/lux/documentation.lux
+++ b/stdlib/source/documentation/lux/documentation.lux
@@ -2,8 +2,8 @@
  [library
   [lux "*"
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/extension.lux b/stdlib/source/documentation/lux/extension.lux
index f2a0dca26..75d42a772 100644
--- a/stdlib/source/documentation/lux/extension.lux
+++ b/stdlib/source/documentation/lux/extension.lux
@@ -1,14 +1,14 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    ["[0]" debug]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
     [text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" sequence]]]
    [macro
diff --git a/stdlib/source/documentation/lux/ffi.js.lux b/stdlib/source/documentation/lux/ffi.js.lux
index df5a6f037..3476a3c5d 100644
--- a/stdlib/source/documentation/lux/ffi.js.lux
+++ b/stdlib/source/documentation/lux/ffi.js.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" int char type}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/ffi.jvm.lux b/stdlib/source/documentation/lux/ffi.jvm.lux
index 2ce78b3a2..35c07b63f 100644
--- a/stdlib/source/documentation/lux/ffi.jvm.lux
+++ b/stdlib/source/documentation/lux/ffi.jvm.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" int char type is as}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/ffi.lua.lux b/stdlib/source/documentation/lux/ffi.lua.lux
index 0126a5117..c1afabc19 100644
--- a/stdlib/source/documentation/lux/ffi.lua.lux
+++ b/stdlib/source/documentation/lux/ffi.lua.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" int char type}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/ffi.old.lux b/stdlib/source/documentation/lux/ffi.old.lux
index 926b70045..83f587a1c 100644
--- a/stdlib/source/documentation/lux/ffi.old.lux
+++ b/stdlib/source/documentation/lux/ffi.old.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" int char type}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/ffi.py.lux b/stdlib/source/documentation/lux/ffi.py.lux
index 40ea7878e..b21b56819 100644
--- a/stdlib/source/documentation/lux/ffi.py.lux
+++ b/stdlib/source/documentation/lux/ffi.py.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" int char type}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/ffi.rb.lux b/stdlib/source/documentation/lux/ffi.rb.lux
index 822ad8146..071468773 100644
--- a/stdlib/source/documentation/lux/ffi.rb.lux
+++ b/stdlib/source/documentation/lux/ffi.rb.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" int char type}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/locale.lux b/stdlib/source/documentation/lux/locale.lux
index f3d66353e..d1170b22b 100644
--- a/stdlib/source/documentation/lux/locale.lux
+++ b/stdlib/source/documentation/lux/locale.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" language]
-   ["[1][0]" territory]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" language]
+  ["[1][0]" territory]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Locale
   "A description of a locale; with territory, (optional) language, and (optional) text-encoding.")
diff --git a/stdlib/source/documentation/lux/locale/language.lux b/stdlib/source/documentation/lux/locale/language.lux
index faabf76d2..e63d72fee 100644
--- a/stdlib/source/documentation/lux/locale/language.lux
+++ b/stdlib/source/documentation/lux/locale/language.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Language
   "An ISO 639 language.")
diff --git a/stdlib/source/documentation/lux/locale/territory.lux b/stdlib/source/documentation/lux/locale/territory.lux
index bcff3e835..f444dc1e5 100644
--- a/stdlib/source/documentation/lux/locale/territory.lux
+++ b/stdlib/source/documentation/lux/locale/territory.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Territory
   "An ISO 3166 territory.")
diff --git a/stdlib/source/documentation/lux/macro.lux b/stdlib/source/documentation/lux/macro.lux
index 02e0f77f8..192de3a4c 100644
--- a/stdlib/source/documentation/lux/macro.lux
+++ b/stdlib/source/documentation/lux/macro.lux
@@ -1,19 +1,19 @@
 (.using
-  [library
-   [lux {"-" char symbol}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   ["[1][0]" code]
-   ["[1][0]" local]
-   ["[1][0]" syntax]
-   ["[1][0]" template]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char symbol}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  ["[1][0]" code]
+  ["[1][0]" local]
+  ["[1][0]" syntax]
+  ["[1][0]" template]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.single_expansion
   (format "Given code that requires applying a macro, does it once and returns the result."
diff --git a/stdlib/source/documentation/lux/macro/code.lux b/stdlib/source/documentation/lux/macro/code.lux
index 1a824238f..39695a9f4 100644
--- a/stdlib/source/documentation/lux/macro/code.lux
+++ b/stdlib/source/documentation/lux/macro/code.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char local global}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char local global}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.local
   "Produces a local symbol (an symbol with no module prefix).")
diff --git a/stdlib/source/documentation/lux/macro/local.lux b/stdlib/source/documentation/lux/macro/local.lux
index 6f9783f90..e9ee18890 100644
--- a/stdlib/source/documentation/lux/macro/local.lux
+++ b/stdlib/source/documentation/lux/macro/local.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.push
   (format "Installs macros in the compiler-state, with the given names."
diff --git a/stdlib/source/documentation/lux/macro/syntax.lux b/stdlib/source/documentation/lux/macro/syntax.lux
index 664439f72..847fae3ac 100644
--- a/stdlib/source/documentation/lux/macro/syntax.lux
+++ b/stdlib/source/documentation/lux/macro/syntax.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  ["[0]" / "_"
diff --git a/stdlib/source/documentation/lux/macro/syntax/check.lux b/stdlib/source/documentation/lux/macro/syntax/check.lux
index 5a34c038b..560eedd76 100644
--- a/stdlib/source/documentation/lux/macro/syntax/check.lux
+++ b/stdlib/source/documentation/lux/macro/syntax/check.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Check
   "A type annotation for an expression.")
diff --git a/stdlib/source/documentation/lux/macro/syntax/declaration.lux b/stdlib/source/documentation/lux/macro/syntax/declaration.lux
index e2d4d415e..6bb312a33 100644
--- a/stdlib/source/documentation/lux/macro/syntax/declaration.lux
+++ b/stdlib/source/documentation/lux/macro/syntax/declaration.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Declaration
   "A declaration for either a constant or a function.")
diff --git a/stdlib/source/documentation/lux/macro/syntax/definition.lux b/stdlib/source/documentation/lux/macro/syntax/definition.lux
index 00326aaa9..f8c276133 100644
--- a/stdlib/source/documentation/lux/macro/syntax/definition.lux
+++ b/stdlib/source/documentation/lux/macro/syntax/definition.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" Definition}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" Definition}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Definition
   "Syntax for a constant definition.")
diff --git a/stdlib/source/documentation/lux/macro/syntax/export.lux b/stdlib/source/documentation/lux/macro/syntax/export.lux
index 95a4895f1..39a814663 100644
--- a/stdlib/source/documentation/lux/macro/syntax/export.lux
+++ b/stdlib/source/documentation/lux/macro/syntax/export.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.parser
   ""
diff --git a/stdlib/source/documentation/lux/macro/syntax/input.lux b/stdlib/source/documentation/lux/macro/syntax/input.lux
index f64392647..26ca37784 100644
--- a/stdlib/source/documentation/lux/macro/syntax/input.lux
+++ b/stdlib/source/documentation/lux/macro/syntax/input.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Input
   "The common typed-argument syntax used by many macros.")
diff --git a/stdlib/source/documentation/lux/macro/syntax/type/variable.lux b/stdlib/source/documentation/lux/macro/syntax/type/variable.lux
index 2144f9b4f..408740210 100644
--- a/stdlib/source/documentation/lux/macro/syntax/type/variable.lux
+++ b/stdlib/source/documentation/lux/macro/syntax/type/variable.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Variable
   "A variable's name.")
diff --git a/stdlib/source/documentation/lux/macro/template.lux b/stdlib/source/documentation/lux/macro/template.lux
index 495832bdf..aed55fb9a 100644
--- a/stdlib/source/documentation/lux/macro/template.lux
+++ b/stdlib/source/documentation/lux/macro/template.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" let symbol}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" let symbol}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.spliced
   ""
diff --git a/stdlib/source/documentation/lux/math.lux b/stdlib/source/documentation/lux/math.lux
index 06db95c3a..dd5783817 100644
--- a/stdlib/source/documentation/lux/math.lux
+++ b/stdlib/source/documentation/lux/math.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
     [text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  ["[0]" / "_"
diff --git a/stdlib/source/documentation/lux/math/infix.lux b/stdlib/source/documentation/lux/math/infix.lux
index 9f6f7f8ed..e9164740a 100644
--- a/stdlib/source/documentation/lux/math/infix.lux
+++ b/stdlib/source/documentation/lux/math/infix.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.infix
   (format "Infix math syntax."
diff --git a/stdlib/source/documentation/lux/math/logic.lux b/stdlib/source/documentation/lux/math/logic.lux
index 11d930333..23b3e5c3f 100644
--- a/stdlib/source/documentation/lux/math/logic.lux
+++ b/stdlib/source/documentation/lux/math/logic.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
     [text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" monoid)]]]]]
  ["[0]" / "_"
diff --git a/stdlib/source/documentation/lux/math/logic/continuous.lux b/stdlib/source/documentation/lux/math/logic/continuous.lux
index b7d95a8c9..ea81cd054 100644
--- a/stdlib/source/documentation/lux/math/logic/continuous.lux
+++ b/stdlib/source/documentation/lux/math/logic/continuous.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.implies
   ""
diff --git a/stdlib/source/documentation/lux/math/logic/fuzzy.lux b/stdlib/source/documentation/lux/math/logic/fuzzy.lux
index f101e1451..0058d01fc 100644
--- a/stdlib/source/documentation/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/documentation/lux/math/logic/fuzzy.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Fuzzy it)
   "A fuzzy set.")
diff --git a/stdlib/source/documentation/lux/math/modular.lux b/stdlib/source/documentation/lux/math/modular.lux
index e6fe66781..4af0f2b2a 100644
--- a/stdlib/source/documentation/lux/math/modular.lux
+++ b/stdlib/source/documentation/lux/math/modular.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Mod %)
   "A number under a modulus.")
diff --git a/stdlib/source/documentation/lux/math/modulus.lux b/stdlib/source/documentation/lux/math/modulus.lux
index dc44b99df..940974ff5 100644
--- a/stdlib/source/documentation/lux/math/modulus.lux
+++ b/stdlib/source/documentation/lux/math/modulus.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Modulus %)
   (format "A number used as a modulus in modular arithmetic."
diff --git a/stdlib/source/documentation/lux/math/number.lux b/stdlib/source/documentation/lux/math/number.lux
index 3cb492042..e1df87e80 100644
--- a/stdlib/source/documentation/lux/math/number.lux
+++ b/stdlib/source/documentation/lux/math/number.lux
@@ -1,25 +1,25 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" i8]
-   ["[1][0]" i16]
-   ["[1][0]" i32]
-   ["[1][0]" i64]
-   ["[1][0]" nat]
-   ["[1][0]" int]
-   ["[1][0]" rev]
-   ["[1][0]" frac]
-   ["[1][0]" ratio]
-   ["[1][0]" complex]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" i8]
+  ["[1][0]" i16]
+  ["[1][0]" i32]
+  ["[1][0]" i64]
+  ["[1][0]" nat]
+  ["[1][0]" int]
+  ["[1][0]" rev]
+  ["[1][0]" frac]
+  ["[1][0]" ratio]
+  ["[1][0]" complex]])
 
 (template [<name> <encoding> <no_commas> <with_commas>]
   [(documentation: <name>
diff --git a/stdlib/source/documentation/lux/math/number/complex.lux b/stdlib/source/documentation/lux/math/number/complex.lux
index fd912cd57..05ea3ef79 100644
--- a/stdlib/source/documentation/lux/math/number/complex.lux
+++ b/stdlib/source/documentation/lux/math/number/complex.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" private}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/math/number/frac.lux b/stdlib/source/documentation/lux/math/number/frac.lux
index 3378609bb..051f45924 100644
--- a/stdlib/source/documentation/lux/math/number/frac.lux
+++ b/stdlib/source/documentation/lux/math/number/frac.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" private}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/math/number/i16.lux b/stdlib/source/documentation/lux/math/number/i16.lux
index a1c8d5f4b..97cfa33e3 100644
--- a/stdlib/source/documentation/lux/math/number/i16.lux
+++ b/stdlib/source/documentation/lux/math/number/i16.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.I16
   "A 16-bit integer.")
diff --git a/stdlib/source/documentation/lux/math/number/i32.lux b/stdlib/source/documentation/lux/math/number/i32.lux
index 0571dd876..3afe8dc41 100644
--- a/stdlib/source/documentation/lux/math/number/i32.lux
+++ b/stdlib/source/documentation/lux/math/number/i32.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.I32
   "A 32-bit integer.")
diff --git a/stdlib/source/documentation/lux/math/number/i64.lux b/stdlib/source/documentation/lux/math/number/i64.lux
index 7cc53e741..03c3d8d1d 100644
--- a/stdlib/source/documentation/lux/math/number/i64.lux
+++ b/stdlib/source/documentation/lux/math/number/i64.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" or and not}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" or and not}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (template [<name> <doc>]
   [(documentation: <name>
diff --git a/stdlib/source/documentation/lux/math/number/i8.lux b/stdlib/source/documentation/lux/math/number/i8.lux
index 2dbe3e958..1fea5cd48 100644
--- a/stdlib/source/documentation/lux/math/number/i8.lux
+++ b/stdlib/source/documentation/lux/math/number/i8.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.I8
   "A 8-bit integer.")
diff --git a/stdlib/source/documentation/lux/math/number/int.lux b/stdlib/source/documentation/lux/math/number/int.lux
index beefffd00..c520bb867 100644
--- a/stdlib/source/documentation/lux/math/number/int.lux
+++ b/stdlib/source/documentation/lux/math/number/int.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.=
   "Int(eger) equivalence."
diff --git a/stdlib/source/documentation/lux/math/number/nat.lux b/stdlib/source/documentation/lux/math/number/nat.lux
index 155d9249e..9773fbaa9 100644
--- a/stdlib/source/documentation/lux/math/number/nat.lux
+++ b/stdlib/source/documentation/lux/math/number/nat.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (template [<name> <documentation>]
   [(documentation: <name>
diff --git a/stdlib/source/documentation/lux/math/number/ratio.lux b/stdlib/source/documentation/lux/math/number/ratio.lux
index 620e1a41c..5e5b805a1 100644
--- a/stdlib/source/documentation/lux/math/number/ratio.lux
+++ b/stdlib/source/documentation/lux/math/number/ratio.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Ratio
   "An unsigned ratio of numbers.")
diff --git a/stdlib/source/documentation/lux/math/number/rev.lux b/stdlib/source/documentation/lux/math/number/rev.lux
index ba91d9c30..a76069bc4 100644
--- a/stdlib/source/documentation/lux/math/number/rev.lux
+++ b/stdlib/source/documentation/lux/math/number/rev.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.=
   "Rev(olution) equivalence."
diff --git a/stdlib/source/documentation/lux/math/random.lux b/stdlib/source/documentation/lux/math/random.lux
index 258de2631..2d16c59b0 100644
--- a/stdlib/source/documentation/lux/math/random.lux
+++ b/stdlib/source/documentation/lux/math/random.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" or and nat int rev}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/meta.lux b/stdlib/source/documentation/lux/meta.lux
index 1d29f25c7..e450a6b9a 100644
--- a/stdlib/source/documentation/lux/meta.lux
+++ b/stdlib/source/documentation/lux/meta.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" type macro}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" location]
-   ["[1][0]" symbol]])
+ [library
+  [lux {"-" type macro}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" location]
+  ["[1][0]" symbol]])
 
 (documentation: /.result'
   (format "Evaluates a computation that depends on Lux's compiler state."
diff --git a/stdlib/source/documentation/lux/meta/location.lux b/stdlib/source/documentation/lux/meta/location.lux
index f4444216d..e4b9424fe 100644
--- a/stdlib/source/documentation/lux/meta/location.lux
+++ b/stdlib/source/documentation/lux/meta/location.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" private}
-    ["$" documentation {"+" documentation:}]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" private}
+   ["$" documentation (.only documentation:)]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.here
   "The Location of the current form."
diff --git a/stdlib/source/documentation/lux/meta/symbol.lux b/stdlib/source/documentation/lux/meta/symbol.lux
index dd68301aa..924ada33c 100644
--- a/stdlib/source/documentation/lux/meta/symbol.lux
+++ b/stdlib/source/documentation/lux/meta/symbol.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" nat int rev list type or and}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" nat int rev list type or and}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.module
   "The module part of a symbol.")
diff --git a/stdlib/source/documentation/lux/program.lux b/stdlib/source/documentation/lux/program.lux
index 181c912b7..d60b2d633 100644
--- a/stdlib/source/documentation/lux/program.lux
+++ b/stdlib/source/documentation/lux/program.lux
@@ -1,16 +1,16 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["[0]" io]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [control
+    ["[0]" io]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.program:
   "Defines the entry-point to a program (similar to the 'main' function/method in other programming languages)."
diff --git a/stdlib/source/documentation/lux/static.lux b/stdlib/source/documentation/lux/static.lux
index bcde2dad6..025a3da30 100644
--- a/stdlib/source/documentation/lux/static.lux
+++ b/stdlib/source/documentation/lux/static.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" nat int rev}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
     [text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target.lux b/stdlib/source/documentation/lux/target.lux
index 11691d06f..9d5eca38e 100644
--- a/stdlib/source/documentation/lux/target.lux
+++ b/stdlib/source/documentation/lux/target.lux
@@ -1,20 +1,20 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" js]
-   ["[1][0]" jvm]
-   ["[1][0]" lua]
-   ["[1][0]" python]
-   ["[1][0]" ruby]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" js]
+  ["[1][0]" jvm]
+  ["[1][0]" lua]
+  ["[1][0]" python]
+  ["[1][0]" ruby]])
 
 (documentation: /.Target
   (format "The name/ID of a platform targetted by a Lux compiler."
diff --git a/stdlib/source/documentation/lux/target/js.lux b/stdlib/source/documentation/lux/target/js.lux
index 744b61310..ac31482ce 100644
--- a/stdlib/source/documentation/lux/target/js.lux
+++ b/stdlib/source/documentation/lux/target/js.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm.lux b/stdlib/source/documentation/lux/target/jvm.lux
index fe6cc7ab6..fdaed612c 100644
--- a/stdlib/source/documentation/lux/target/jvm.lux
+++ b/stdlib/source/documentation/lux/target/jvm.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm/type.lux b/stdlib/source/documentation/lux/target/jvm/type.lux
index e4e3f042c..d83e27552 100644
--- a/stdlib/source/documentation/lux/target/jvm/type.lux
+++ b/stdlib/source/documentation/lux/target/jvm/type.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm/type/alias.lux b/stdlib/source/documentation/lux/target/jvm/type/alias.lux
index 72ace63a0..d37664b30 100644
--- a/stdlib/source/documentation/lux/target/jvm/type/alias.lux
+++ b/stdlib/source/documentation/lux/target/jvm/type/alias.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm/type/box.lux b/stdlib/source/documentation/lux/target/jvm/type/box.lux
index ef7426ec7..a17addccd 100644
--- a/stdlib/source/documentation/lux/target/jvm/type/box.lux
+++ b/stdlib/source/documentation/lux/target/jvm/type/box.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm/type/category.lux b/stdlib/source/documentation/lux/target/jvm/type/category.lux
index 370ba21b3..b6f28d7dc 100644
--- a/stdlib/source/documentation/lux/target/jvm/type/category.lux
+++ b/stdlib/source/documentation/lux/target/jvm/type/category.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm/type/descriptor.lux b/stdlib/source/documentation/lux/target/jvm/type/descriptor.lux
index 51dd8be76..8a77f56a5 100644
--- a/stdlib/source/documentation/lux/target/jvm/type/descriptor.lux
+++ b/stdlib/source/documentation/lux/target/jvm/type/descriptor.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm/type/lux.lux b/stdlib/source/documentation/lux/target/jvm/type/lux.lux
index d0a9120fc..72b240c89 100644
--- a/stdlib/source/documentation/lux/target/jvm/type/lux.lux
+++ b/stdlib/source/documentation/lux/target/jvm/type/lux.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm/type/parser.lux b/stdlib/source/documentation/lux/target/jvm/type/parser.lux
index dd04f9b9c..b3ccb4da1 100644
--- a/stdlib/source/documentation/lux/target/jvm/type/parser.lux
+++ b/stdlib/source/documentation/lux/target/jvm/type/parser.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm/type/reflection.lux b/stdlib/source/documentation/lux/target/jvm/type/reflection.lux
index b386fa4ff..190fd48a6 100644
--- a/stdlib/source/documentation/lux/target/jvm/type/reflection.lux
+++ b/stdlib/source/documentation/lux/target/jvm/type/reflection.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/jvm/type/signature.lux b/stdlib/source/documentation/lux/target/jvm/type/signature.lux
index ff3df3280..6b65f4b8e 100644
--- a/stdlib/source/documentation/lux/target/jvm/type/signature.lux
+++ b/stdlib/source/documentation/lux/target/jvm/type/signature.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux {"-" char}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/lua.lux b/stdlib/source/documentation/lux/target/lua.lux
index 657caf75a..efadf5a77 100644
--- a/stdlib/source/documentation/lux/target/lua.lux
+++ b/stdlib/source/documentation/lux/target/lua.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/python.lux b/stdlib/source/documentation/lux/target/python.lux
index 60d5172bd..d835e8948 100644
--- a/stdlib/source/documentation/lux/target/python.lux
+++ b/stdlib/source/documentation/lux/target/python.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/target/ruby.lux b/stdlib/source/documentation/lux/target/ruby.lux
index 0f24c30da..190b2faee 100644
--- a/stdlib/source/documentation/lux/target/ruby.lux
+++ b/stdlib/source/documentation/lux/target/ruby.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/test.lux b/stdlib/source/documentation/lux/test.lux
index ade8f549f..5d0167ac5 100644
--- a/stdlib/source/documentation/lux/test.lux
+++ b/stdlib/source/documentation/lux/test.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" and for}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/time.lux b/stdlib/source/documentation/lux/time.lux
index 9395a6357..9df383e0c 100644
--- a/stdlib/source/documentation/lux/time.lux
+++ b/stdlib/source/documentation/lux/time.lux
@@ -1,24 +1,24 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" date]
-   ["[1][0]" day]
-   ["[1][0]" duration]
-   ["[1][0]" instant]
-   ["[1][0]" month]
-   ["[1][0]" year]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" date]
+  ["[1][0]" day]
+  ["[1][0]" duration]
+  ["[1][0]" instant]
+  ["[1][0]" month]
+  ["[1][0]" year]])
 
 (template [<name> <doc>]
   [(documentation: <name>
diff --git a/stdlib/source/documentation/lux/time/date.lux b/stdlib/source/documentation/lux/time/date.lux
index 24a49a5b1..017449554 100644
--- a/stdlib/source/documentation/lux/time/date.lux
+++ b/stdlib/source/documentation/lux/time/date.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Date
   "A date specified as a year/month/day triplet.")
diff --git a/stdlib/source/documentation/lux/time/day.lux b/stdlib/source/documentation/lux/time/day.lux
index 85a19aec7..715d09a15 100644
--- a/stdlib/source/documentation/lux/time/day.lux
+++ b/stdlib/source/documentation/lux/time/day.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Day
   "A day of the week.")
diff --git a/stdlib/source/documentation/lux/time/duration.lux b/stdlib/source/documentation/lux/time/duration.lux
index fcd2a6706..37dbf4d72 100644
--- a/stdlib/source/documentation/lux/time/duration.lux
+++ b/stdlib/source/documentation/lux/time/duration.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" and}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/time/instant.lux b/stdlib/source/documentation/lux/time/instant.lux
index b4a7e4d09..fca8f288d 100644
--- a/stdlib/source/documentation/lux/time/instant.lux
+++ b/stdlib/source/documentation/lux/time/instant.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Instant
   "Instant is defined as milli-seconds since the epoch.")
diff --git a/stdlib/source/documentation/lux/time/month.lux b/stdlib/source/documentation/lux/time/month.lux
index b59eac676..4f8bfc14c 100644
--- a/stdlib/source/documentation/lux/time/month.lux
+++ b/stdlib/source/documentation/lux/time/month.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Month
   "A month of the year.")
diff --git a/stdlib/source/documentation/lux/time/year.lux b/stdlib/source/documentation/lux/time/year.lux
index f4d6807bb..099b0ea09 100644
--- a/stdlib/source/documentation/lux/time/year.lux
+++ b/stdlib/source/documentation/lux/time/year.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Year
   (format "A year in the gregorian calendar."
diff --git a/stdlib/source/documentation/lux/tool.lux b/stdlib/source/documentation/lux/tool.lux
index f101ea48d..84090f0bb 100644
--- a/stdlib/source/documentation/lux/tool.lux
+++ b/stdlib/source/documentation/lux/tool.lux
@@ -1,21 +1,21 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  ["[0]" / "_"
-   [compiler
-    ["[1][0]" phase]
-    [language
-     [lux
-      ["[1][0]" analysis]
-      ["[1][0]" directive]
-      ["[1][0]" generation]
-      ["[1][0]" synthesis]]]]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ ["[0]" / "_"
+  [compiler
+   ["[1][0]" phase]
+   [language
+    [lux
+     ["[1][0]" analysis]
+     ["[1][0]" directive]
+     ["[1][0]" generation]
+     ["[1][0]" synthesis]]]]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/documentation/lux/tool/compiler/language/lux/analysis.lux
index 8cda0769a..949b46218 100644
--- a/stdlib/source/documentation/lux/tool/compiler/language/lux/analysis.lux
+++ b/stdlib/source/documentation/lux/tool/compiler/language/lux/analysis.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/tool/compiler/language/lux/directive.lux b/stdlib/source/documentation/lux/tool/compiler/language/lux/directive.lux
index f47919714..69444aff6 100644
--- a/stdlib/source/documentation/lux/tool/compiler/language/lux/directive.lux
+++ b/stdlib/source/documentation/lux/tool/compiler/language/lux/directive.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/tool/compiler/language/lux/generation.lux b/stdlib/source/documentation/lux/tool/compiler/language/lux/generation.lux
index e02893f28..f4ffdb570 100644
--- a/stdlib/source/documentation/lux/tool/compiler/language/lux/generation.lux
+++ b/stdlib/source/documentation/lux/tool/compiler/language/lux/generation.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/documentation/lux/tool/compiler/language/lux/synthesis.lux
index ada773fab..0fe773f75 100644
--- a/stdlib/source/documentation/lux/tool/compiler/language/lux/synthesis.lux
+++ b/stdlib/source/documentation/lux/tool/compiler/language/lux/synthesis.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [data
-    [text {"+" \n}
-     ["%" format {"+" format}]]
+    [text (.only \n)
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/tool/compiler/phase.lux b/stdlib/source/documentation/lux/tool/compiler/phase.lux
index 0ef45f8db..824383330 100644
--- a/stdlib/source/documentation/lux/tool/compiler/phase.lux
+++ b/stdlib/source/documentation/lux/tool/compiler/phase.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux {"-" char}
-    ["$" documentation {"+" documentation:}]
-    [data
-     [text {"+" \n}
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" char}
+   ["$" documentation (.only documentation:)]
+   [data
+    [text (.only \n)
+     ["%" format (.only format)]]
+    [collection
+     ["[0]" list]]]]]
+ [\\library
+  ["[0]" /]])
 
 (.def: .public documentation
   (.List $.Module)
diff --git a/stdlib/source/documentation/lux/type.lux b/stdlib/source/documentation/lux/type.lux
index f7d1e3f64..a33565f6f 100644
--- a/stdlib/source/documentation/lux/type.lux
+++ b/stdlib/source/documentation/lux/type.lux
@@ -1,12 +1,12 @@
 (.using
  [library
   [lux {"-" function as let}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
+    ["[0]" text (.only \n)
      ["%" format]]]
    [macro
     ["[0]" template]]]]
diff --git a/stdlib/source/documentation/lux/type/check.lux b/stdlib/source/documentation/lux/type/check.lux
index 92a02c563..4cf4e2e69 100644
--- a/stdlib/source/documentation/lux/type/check.lux
+++ b/stdlib/source/documentation/lux/type/check.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Var
   "The ID for a type-variable in a type-checking context.")
diff --git a/stdlib/source/documentation/lux/type/dynamic.lux b/stdlib/source/documentation/lux/type/dynamic.lux
index 1140e6158..53ef5fffe 100644
--- a/stdlib/source/documentation/lux/type/dynamic.lux
+++ b/stdlib/source/documentation/lux/type/dynamic.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" static}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/type/implicit.lux b/stdlib/source/documentation/lux/type/implicit.lux
index 6596b7f97..58822366c 100644
--- a/stdlib/source/documentation/lux/type/implicit.lux
+++ b/stdlib/source/documentation/lux/type/implicit.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.##
   (format "Automatic implementation selection (for type-class style polymorphism)."
diff --git a/stdlib/source/documentation/lux/type/poly.lux b/stdlib/source/documentation/lux/type/poly.lux
index bb8f1489e..ba787f87d 100644
--- a/stdlib/source/documentation/lux/type/poly.lux
+++ b/stdlib/source/documentation/lux/type/poly.lux
@@ -1,21 +1,21 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [abstract
-     [\\specification
-      ["$[0]" equivalence]
-      ["$[0]" codec]]]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [abstract
+    [\\specification
+     ["$[0]" equivalence]
+     ["$[0]" codec]]]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.code
   ""
diff --git a/stdlib/source/documentation/lux/type/primitive.lux b/stdlib/source/documentation/lux/type/primitive.lux
index e4a180bfc..b8e885dcf 100644
--- a/stdlib/source/documentation/lux/type/primitive.lux
+++ b/stdlib/source/documentation/lux/type/primitive.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/type/quotient.lux b/stdlib/source/documentation/lux/type/quotient.lux
index 799645f81..9013f97a9 100644
--- a/stdlib/source/documentation/lux/type/quotient.lux
+++ b/stdlib/source/documentation/lux/type/quotient.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" type}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/type/refinement.lux b/stdlib/source/documentation/lux/type/refinement.lux
index bbe26014b..43386ca18 100644
--- a/stdlib/source/documentation/lux/type/refinement.lux
+++ b/stdlib/source/documentation/lux/type/refinement.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" type}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/type/resource.lux b/stdlib/source/documentation/lux/type/resource.lux
index cb3ec74bc..0df523b1f 100644
--- a/stdlib/source/documentation/lux/type/resource.lux
+++ b/stdlib/source/documentation/lux/type/resource.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Procedure monad input output value)
   (format "A computation that takes a sequence of resource access rights as inputs and yields a different sequence as outputs."
diff --git a/stdlib/source/documentation/lux/type/unit.lux b/stdlib/source/documentation/lux/type/unit.lux
index a3d37d552..dabf9262b 100644
--- a/stdlib/source/documentation/lux/type/unit.lux
+++ b/stdlib/source/documentation/lux/type/unit.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux {"-" and}
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]
    [math
diff --git a/stdlib/source/documentation/lux/type/variance.lux b/stdlib/source/documentation/lux/type/variance.lux
index 8969e37e9..e02756049 100644
--- a/stdlib/source/documentation/lux/type/variance.lux
+++ b/stdlib/source/documentation/lux/type/variance.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux {"-" and}
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux {"-" and}
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Co it)
   "A constraint for covariant types.")
diff --git a/stdlib/source/documentation/lux/world.lux b/stdlib/source/documentation/lux/world.lux
index d226dfa3d..527c627d4 100644
--- a/stdlib/source/documentation/lux/world.lux
+++ b/stdlib/source/documentation/lux/world.lux
@@ -1,8 +1,8 @@
 (.using
  [library
   [lux "*"
-   [program {"+" program:}]
-   ["$" documentation {"+" documentation:}]
+   [program (.only program:)]
+   ["$" documentation (.only documentation:)]
    ["[0]" debug]
    [control
     ["[0]" io]]
diff --git a/stdlib/source/documentation/lux/world/console.lux b/stdlib/source/documentation/lux/world/console.lux
index bc7cd8818..cea7b0662 100644
--- a/stdlib/source/documentation/lux/world/console.lux
+++ b/stdlib/source/documentation/lux/world/console.lux
@@ -1,14 +1,14 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    ["@" target]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/world/file.lux b/stdlib/source/documentation/lux/world/file.lux
index 33b42c72b..639d0b43a 100644
--- a/stdlib/source/documentation/lux/world/file.lux
+++ b/stdlib/source/documentation/lux/world/file.lux
@@ -1,14 +1,14 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    ["@" target]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/world/file/watch.lux b/stdlib/source/documentation/lux/world/file/watch.lux
index 3cf437056..017d6e707 100644
--- a/stdlib/source/documentation/lux/world/file/watch.lux
+++ b/stdlib/source/documentation/lux/world/file/watch.lux
@@ -1,14 +1,14 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    ["@" target]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/world/input/keyboard.lux b/stdlib/source/documentation/lux/world/input/keyboard.lux
index c379ef102..d224f77b3 100644
--- a/stdlib/source/documentation/lux/world/input/keyboard.lux
+++ b/stdlib/source/documentation/lux/world/input/keyboard.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.Key
   "A key from a keyboard, identify by a numeric ID.")
diff --git a/stdlib/source/documentation/lux/world/net.lux b/stdlib/source/documentation/lux/world/net.lux
index 602177486..ba9f93fd5 100644
--- a/stdlib/source/documentation/lux/world/net.lux
+++ b/stdlib/source/documentation/lux/world/net.lux
@@ -1,18 +1,18 @@
 (.using
-  [library
-   [lux "*"
-    [program {"+" program:}]
-    ["$" documentation {"+" documentation:}]
-    ["[0]" debug]
-    [control
-     ["[0]" io]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" uri]
-   ["[1][0]" http "_"
-    ["[1]/[0]" client]
-    ["[1]/[0]" status]]])
+ [library
+  [lux "*"
+   [program (.only program:)]
+   ["$" documentation (.only documentation:)]
+   ["[0]" debug]
+   [control
+    ["[0]" io]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" uri]
+  ["[1][0]" http "_"
+   ["[1]/[0]" client]
+   ["[1]/[0]" status]]])
 
 (documentation: /.Address
   "A TCP/IP address.")
diff --git a/stdlib/source/documentation/lux/world/net/http/client.lux b/stdlib/source/documentation/lux/world/net/http/client.lux
index a84745c73..69132bbc3 100644
--- a/stdlib/source/documentation/lux/world/net/http/client.lux
+++ b/stdlib/source/documentation/lux/world/net/http/client.lux
@@ -1,14 +1,14 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    ["@" target]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/world/net/http/status.lux b/stdlib/source/documentation/lux/world/net/http/status.lux
index 434cc9f7c..a6555daa1 100644
--- a/stdlib/source/documentation/lux/world/net/http/status.lux
+++ b/stdlib/source/documentation/lux/world/net/http/status.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (template [<name>]
   [(documentation: <name>
diff --git a/stdlib/source/documentation/lux/world/net/uri.lux b/stdlib/source/documentation/lux/world/net/uri.lux
index d25248a81..33094197b 100644
--- a/stdlib/source/documentation/lux/world/net/uri.lux
+++ b/stdlib/source/documentation/lux/world/net/uri.lux
@@ -1,13 +1,13 @@
 (.using
-  [library
-   [lux "*"
-    [program {"+" program:}]
-    ["$" documentation {"+" documentation:}]
-    ["[0]" debug]
-    [control
-     ["[0]" io]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   [program (.only program:)]
+   ["$" documentation (.only documentation:)]
+   ["[0]" debug]
+   [control
+    ["[0]" io]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: /.URI
   "A Uniform Resource Identifier.")
diff --git a/stdlib/source/documentation/lux/world/output/video/resolution.lux b/stdlib/source/documentation/lux/world/output/video/resolution.lux
index 27a42050c..707ed98fa 100644
--- a/stdlib/source/documentation/lux/world/output/video/resolution.lux
+++ b/stdlib/source/documentation/lux/world/output/video/resolution.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/world/program.lux b/stdlib/source/documentation/lux/world/program.lux
index 34040fa5c..4e46381ea 100644
--- a/stdlib/source/documentation/lux/world/program.lux
+++ b/stdlib/source/documentation/lux/world/program.lux
@@ -1,17 +1,17 @@
 (.using
-  [library
-   [lux "*"
-    ["$" documentation {"+" documentation:}]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" text {"+" \n}
-      ["%" format {"+" format}]]]
-    [macro
-     ["[0]" template]]]]
-  [\\library
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["$" documentation (.only documentation:)]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
+   [macro
+    ["[0]" template]]]]
+ [\\library
+  ["[0]" /]])
 
 (documentation: (/.Program !)
   "Access to ambient program data and the capacity to exit the program.")
diff --git a/stdlib/source/documentation/lux/world/shell.lux b/stdlib/source/documentation/lux/world/shell.lux
index cccc8dc3e..782bc4d63 100644
--- a/stdlib/source/documentation/lux/world/shell.lux
+++ b/stdlib/source/documentation/lux/world/shell.lux
@@ -1,14 +1,14 @@
 (.using
  [library
   [lux "*"
-   ["$" documentation {"+" documentation:}]
+   ["$" documentation (.only documentation:)]
    ["@" target]
    [control
     ["<>" parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text {"+" \n}
-     ["%" format {"+" format}]]]
+    ["[0]" text (.only \n)
+     ["%" format (.only format)]]]
    [macro
     ["[0]" template]]]]
  [\\library
-- 
cgit v1.2.3