Extensible import syntax [Part 4]

39 files changed, 69 insertions, 69 deletions

diff --git a/stdlib/source/library/lux/target/js.lux b/stdlib/source/library/lux/target/js.lux
index 1df20575d..ecae74ab2 100644
--- a/stdlib/source/library/lux/target/js.lux
+++ b/stdlib/source/library/lux/target/js.lux
@@ -4,7 +4,7 @@
    [control
     ["[0]" pipe]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor mix)]]]
@@ -15,7 +15,7 @@
      ["i" int]
      ["f" frac]]]
    [type
-    [primitive (.full)]]]])
+    [primitive (.except)]]]])
 
 (def: expression
   (text.enclosed ["(" ")"]))
diff --git a/stdlib/source/library/lux/target/jvm/attribute.lux b/stdlib/source/library/lux/target/jvm/attribute.lux
index 6894a78bc..522cb9028 100644
--- a/stdlib/source/library/lux/target/jvm/attribute.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute.lux
@@ -17,7 +17,7 @@
    [math
     [number
      ["n" nat]]]]]
- ["[0]" // "_"
+ ["[0]" //
   ["[1][0]" index (.only Index)]
   ["[1][0]" type (.only Type)
    ["[2][0]" signature (.only Signature)]]
@@ -25,7 +25,7 @@
    ["[1][0]" unsigned (.only U2 U4)]]
   ["[1][0]" constant (.only UTF8 Class Value)
    ["[2][0]" pool (.only Pool Resource) ("[1]#[0]" monad)]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" constant (.only Constant)]
   ["[1][0]" code]])
 
diff --git a/stdlib/source/library/lux/target/jvm/attribute/code.lux b/stdlib/source/library/lux/target/jvm/attribute/code.lux
index 7cfd6bdd6..10d2bb92d 100644
--- a/stdlib/source/library/lux/target/jvm/attribute/code.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/code.lux
@@ -13,13 +13,13 @@
    [math
     [number
      ["n" nat]]]]]
- ["[0]" /// "_"
+ ["[0]" ///
   [bytecode
    [environment
     ["[1][0]" limit (.only Limit)]]]
   [encoding
    ["[1][0]" unsigned (.only U2)]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" exception (.only Exception)]])
 
 (type: .public (Code Attribute)
diff --git a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux
index 90e1de102..fc57caa3c 100644
--- a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux
@@ -5,13 +5,13 @@
     [equivalence (.only Equivalence)]]
    [data
     ["[0]" product]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary (.only Writer)]]]
    [math
     [number
      ["n" nat]]]]]
- ["[0]" // "_"
-  ["//[1]" /// "_"
+ ["[0]" //
+  ["//[1]" ///
    [constant (.only Class)]
    ["[1][0]" index (.only Index)]
    [bytecode
diff --git a/stdlib/source/library/lux/target/jvm/attribute/constant.lux b/stdlib/source/library/lux/target/jvm/attribute/constant.lux
index d3a837cea..daae078a5 100644
--- a/stdlib/source/library/lux/target/jvm/attribute/constant.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/constant.lux
@@ -6,7 +6,7 @@
    [data
     [format
      [binary (.only Writer)]]]]]
- ["[0]" /// "_"
+ ["[0]" ///
   [constant (.only Value)]
   ["[1][0]" index (.only Index)]
   [encoding
diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux
index f0d345ef3..1f00b97c7 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode.lux
@@ -28,7 +28,7 @@
      ["n" nat]
      ["i" int]
      ["[0]" i32 (.only I32)]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" address (.only Address)]
   ["[1][0]" jump (.only Jump Big_Jump)]
   ["_" instruction (.only Primitive_Array_Type Instruction Estimator) ("[1]#[0]" monoid)]
@@ -36,7 +36,7 @@
    [limit
     ["/[0]" registry (.only Register Registry)]
     ["/[0]" stack (.only Stack)]]]
-  ["/[1]" // "_"
+  ["/[1]" //
    ["[1][0]" index (.only Index)]
    [encoding
     ["[1][0]" name]
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/target/jvm/bytecode/address.lux
index c20fedb78..84e93dddd 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/address.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/address.lux
@@ -16,9 +16,9 @@
      ["n" nat]]]
    [type
     [primitive (.full)]]]]
- ["[0]" // "_"
+ ["[0]" //
   [jump (.only Big_Jump)]
-  ["/[1]" // "_"
+  ["/[1]" //
    [encoding
     ["[1][0]" unsigned (.only U2)]
     ["[1][0]" signed (.only S4)]]]])
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux
index 85fdbea32..05772986f 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux
@@ -8,12 +8,12 @@
     ["[0]" try (.only Try)]]
    [data
     ["[0]" product]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary (.only Writer) ("[1]#[0]" monoid)]]]
    [math
     [number
      ["n" nat]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" stack (.only Stack)]
   ["[1][0]" registry (.only Registry)]
   [////
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux
index 2fe49b1dd..5304c5759 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux
@@ -15,7 +15,7 @@
      ["n" nat]]]
    [type
     [primitive (.full)]]]]
- ["[0]" ///// "_"
+ ["[0]" /////
   [encoding
    ["[1][0]" unsigned (.only U1 U2)]]
   ["[1][0]" type (.only Type)
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux
index 3e89d3edd..957dc1396 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux
@@ -13,7 +13,7 @@
      [binary (.only Writer)]]]
    [type
     [primitive (.full)]]]]
- ["[0]" ///// "_"
+ ["[0]" /////
   [encoding
    ["[1][0]" unsigned (.only U2)]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
index 45d866c4e..737280844 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
@@ -10,10 +10,10 @@
     ["[0]" try]]
    [data
     ["[0]" product]
-    ["[0]" binary "_"
+    ["[0]" binary
      [/ (.only)]
      ["[1]" \\unsafe]]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary (.only Mutation Specification)]]
     [collection
      ["[0]" list]]]
@@ -24,13 +24,13 @@
      ["n" nat]]]
    [type
     [primitive (.full)]]]]
- ["[0]" // "_"
+ ["[0]" //
   ["[1][0]" address (.only Address)]
   ["[1][0]" jump (.only Jump Big_Jump)]
   [environment
    [limit
     [registry (.only Register)]]]
-  ["/[1]" // "_"
+  ["/[1]" //
    ["[1][0]" index (.only Index)]
    ["[1][0]" constant (.only Class Reference)]
    [encoding
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux
index fa9c1564b..8732aeb2b 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux
@@ -4,9 +4,9 @@
    [abstract
     [equivalence (.only Equivalence)]]
    [data
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary (.only Writer)]]]]]
- ["[0]" /// "_"
+ ["[0]" ///
   [encoding
    ["[1][0]" signed (.only S2 S4)]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux
index 5562fbda8..3af3c5c7c 100644
--- a/stdlib/source/library/lux/target/jvm/class.lux
+++ b/stdlib/source/library/lux/target/jvm/class.lux
@@ -13,7 +13,7 @@
      ["[0]F" binary (.only Writer) ("[1]#[0]" monoid)]]
     [collection
      ["[0]" sequence (.only Sequence)]]]]]
- ["[0]" // "_"
+ ["[0]" //
   ["[1][0]" modifier (.only Modifier modifiers:)]
   ["[1][0]" version (.only Version Minor Major)]
   ["[1][0]" magic (.only Magic)]
diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux
index d637900ce..070be106a 100644
--- a/stdlib/source/library/lux/target/jvm/constant.lux
+++ b/stdlib/source/library/lux/target/jvm/constant.lux
@@ -23,9 +23,9 @@
      ["[0]" frac]]]
    [type
     [primitive (.full)]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" tag]
-  ["/[1]" // "_"
+  ["/[1]" //
    ["[1][0]" index (.only Index)]
    [type
     ["[1][0]" category]
diff --git a/stdlib/source/library/lux/target/jvm/constant/pool.lux b/stdlib/source/library/lux/target/jvm/constant/pool.lux
index 77ae255f3..41f312071 100644
--- a/stdlib/source/library/lux/target/jvm/constant/pool.lux
+++ b/stdlib/source/library/lux/target/jvm/constant/pool.lux
@@ -13,7 +13,7 @@
    [data
     ["[0]" product]
     ["[0]" text]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary (.only Writer) ("specification#[0]" monoid)]]
     [collection
      ["[0]" sequence (.only Sequence) ("[1]#[0]" mix)]]]
diff --git a/stdlib/source/library/lux/target/jvm/constant/tag.lux b/stdlib/source/library/lux/target/jvm/constant/tag.lux
index 157532f8e..e131f5637 100644
--- a/stdlib/source/library/lux/target/jvm/constant/tag.lux
+++ b/stdlib/source/library/lux/target/jvm/constant/tag.lux
@@ -10,7 +10,7 @@
      [binary (.only Writer)]]]
    [type
     [primitive (.full)]]]]
- ["[0]" /// "_"
+ ["[0]" ///
   [encoding
    ["[1][0]" unsigned (.only U1) ("u1//[0]" equivalence)]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/encoding/name.lux b/stdlib/source/library/lux/target/jvm/encoding/name.lux
index ead09ae87..2903d0647 100644
--- a/stdlib/source/library/lux/target/jvm/encoding/name.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/name.lux
@@ -2,7 +2,7 @@
  [library
   [lux (.full)
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]]
    [type
     [primitive (.full)]]]])
diff --git a/stdlib/source/library/lux/target/jvm/encoding/signed.lux b/stdlib/source/library/lux/target/jvm/encoding/signed.lux
index 5e4e6ab8f..b2a3ea524 100644
--- a/stdlib/source/library/lux/target/jvm/encoding/signed.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/signed.lux
@@ -10,7 +10,7 @@
    [data
     [text
      ["%" format (.only format)]]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary (.only Writer)]]]
    [macro
     ["[0]" template]]
diff --git a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
index a9796e99e..4b1cf148d 100644
--- a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
@@ -10,7 +10,7 @@
    [data
     [text
      ["%" format (.only format)]]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary (.only Writer)]]]
    [macro
     ["[0]" template]]
diff --git a/stdlib/source/library/lux/target/jvm/field.lux b/stdlib/source/library/lux/target/jvm/field.lux
index b480dd289..ade45a2f0 100644
--- a/stdlib/source/library/lux/target/jvm/field.lux
+++ b/stdlib/source/library/lux/target/jvm/field.lux
@@ -10,7 +10,7 @@
      ["[0]F" binary (.only Writer) ("[1]#[0]" monoid)]]
     [collection
      ["[0]" sequence (.only Sequence)]]]]]
- ["[0]" // "_"
+ ["[0]" //
   ["[0]" modifier (.only Modifier modifiers:)]
   ["[1][0]" constant (.only UTF8)
    ["[1]/[0]" pool (.only Pool Resource)]]
diff --git a/stdlib/source/library/lux/target/jvm/index.lux b/stdlib/source/library/lux/target/jvm/index.lux
index 341d0a48a..1c4639393 100644
--- a/stdlib/source/library/lux/target/jvm/index.lux
+++ b/stdlib/source/library/lux/target/jvm/index.lux
@@ -8,7 +8,7 @@
      [binary (.only Writer)]]]
    [type
     [primitive (.full)]]]]
- ["[0]" // "_"
+ ["[0]" //
   [encoding
    ["[1][0]" unsigned (.only U2)]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/loader.lux b/stdlib/source/library/lux/target/jvm/loader.lux
index a7870f8fa..8a9ef6df3 100644
--- a/stdlib/source/library/lux/target/jvm/loader.lux
+++ b/stdlib/source/library/lux/target/jvm/loader.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["@" target]
    ["[0]" ffi (.only import: object do_to)]
    [abstract
@@ -13,7 +13,7 @@
      ["[0]" atom (.only Atom)]]]
    [data
     ["[0]" binary (.only Binary)]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" array]
diff --git a/stdlib/source/library/lux/target/jvm/magic.lux b/stdlib/source/library/lux/target/jvm/magic.lux
index f47f24a6c..eb84d4ccf 100644
--- a/stdlib/source/library/lux/target/jvm/magic.lux
+++ b/stdlib/source/library/lux/target/jvm/magic.lux
@@ -5,7 +5,7 @@
     ["[0]" try]]
    [math
     [number (.only hex)]]]]
- ["[0]" // "_"
+ ["[0]" //
   [encoding
    ["[1][0]" unsigned (.only U4)]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux
index a5c6316e7..5fcb74c45 100644
--- a/stdlib/source/library/lux/target/jvm/method.lux
+++ b/stdlib/source/library/lux/target/jvm/method.lux
@@ -8,11 +8,11 @@
     ["[0]" try]]
    [data
     ["[0]" product]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary (.only Writer) ("[1]#[0]" monoid)]]
     [collection
      ["[0]" sequence (.only Sequence)]]]]]
- ["[0]" // "_"
+ ["[0]" //
   ["[1][0]" modifier (.only Modifier modifiers:)]
   ["[1][0]" index (.only Index)]
   ["[1][0]" attribute (.only Attribute)
diff --git a/stdlib/source/library/lux/target/jvm/modifier.lux b/stdlib/source/library/lux/target/jvm/modifier.lux
index 8a33a6da9..01b4c28be 100644
--- a/stdlib/source/library/lux/target/jvm/modifier.lux
+++ b/stdlib/source/library/lux/target/jvm/modifier.lux
@@ -6,7 +6,7 @@
     ["[0]" monoid (.only Monoid)]]
    [control
     ["[0]" try]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<[0]>" code]]]
    [data
     [format
@@ -19,7 +19,7 @@
      ["[0]" i64]]]
    [type
     [primitive (.full)]]]]
- ["[0]" // "_"
+ ["[0]" //
   [encoding
    ["[1][0]" unsigned]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux
index 5ae40f701..cdfe9e9a0 100644
--- a/stdlib/source/library/lux/target/jvm/reflection.lux
+++ b/stdlib/source/library/lux/target/jvm/reflection.lux
@@ -22,10 +22,10 @@
    [math
     [number
      ["n" nat]]]]]
- ["[0]" // "_"
+ ["[0]" //
   [encoding
    ["[1][0]" name (.only External)]]
-  ["/" type
+  ["/" type (.only)
    [category (.only Void Value Return Method Primitive Object Class Array Parameter)]
    ["[1][0]" lux (.only Mapping)]
    ["[1][0]" descriptor]
diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux
index 919f972eb..0c147ce6a 100644
--- a/stdlib/source/library/lux/target/jvm/type.lux
+++ b/stdlib/source/library/lux/target/jvm/type.lux
@@ -7,7 +7,7 @@
    [control
     ["[0]" maybe]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only Format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor)]]]
@@ -16,10 +16,10 @@
      ["n" nat]]]
    [type
     [primitive (.full)]]]]
- ["[0]" // "_"
+ ["[0]" //
   [encoding
    ["[1][0]" name (.only External)]]]
- ["[0]" / "_"
+ ["[0]" /
   [category (.only Void Value' Value Return' Return Method Primitive Object Class Array Var Parameter Declaration)]
   ["[1][0]" signature (.only Signature)]
   ["[1][0]" descriptor (.only Descriptor)]
diff --git a/stdlib/source/library/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/target/jvm/type/alias.lux
index 5fd733703..7313b1e8b 100644
--- a/stdlib/source/library/lux/target/jvm/type/alias.lux
+++ b/stdlib/source/library/lux/target/jvm/type/alias.lux
@@ -7,10 +7,10 @@
     ["[0]" maybe]
     ["[0]" try]
     ["[0]" exception (.only exception:)]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<[0]>" text (.only Parser)]]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" dictionary (.only Dictionary)]]]]]
@@ -20,7 +20,7 @@
   ["[1][0]" signature (.only Signature)]
   ["[1][0]" reflection]
   ["[1][0]" parser]
-  ["/[1]" // "_"
+  ["/[1]" //
    [encoding
     ["[1][0]" name]]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/target/jvm/type/descriptor.lux
index 42c62c7d0..3d2f98b7b 100644
--- a/stdlib/source/library/lux/target/jvm/type/descriptor.lux
+++ b/stdlib/source/library/lux/target/jvm/type/descriptor.lux
@@ -15,9 +15,9 @@
      ["n" nat]]]
    [type
     [primitive (.full)]]]]
- ["[0]" // "_"
+ ["[0]" //
   [category (.only Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
-  ["/[1]" // "_"
+  ["/[1]" //
    [encoding
     ["[1][0]" name (.only Internal External)]]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux
index b36f30f5f..671351662 100644
--- a/stdlib/source/library/lux/target/jvm/type/lux.lux
+++ b/stdlib/source/library/lux/target/jvm/type/lux.lux
@@ -18,14 +18,14 @@
    [type
     [primitive (.full)]
     ["[0]" check (.only Check) ("[1]#[0]" monad)]]]]
- ["[0]" //
+ ["[0]" // (.only)
   [category (.only Void Value Return Method Primitive Object Class Array Var Parameter)]
   ["[1][0]" descriptor]
   ["[1][0]" signature]
   ["[1][0]" reflection]
   ["[1][0]" parser]
   ["[1][0]" box]
-  ["/[1]" // "_"
+  ["/[1]" //
    [encoding
     ["[1][0]" name]]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/type/parser.lux b/stdlib/source/library/lux/target/jvm/type/parser.lux
index 91be344ea..4a0aa756c 100644
--- a/stdlib/source/library/lux/target/jvm/type/parser.lux
+++ b/stdlib/source/library/lux/target/jvm/type/parser.lux
@@ -18,7 +18,7 @@
   [category (.only Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
   ["[1][0]" signature]
   ["[1][0]" descriptor]
-  ["[0]" // "_"
+  ["[0]" // (.only)
    [encoding
     ["[1][0]" name (.only External)]]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/type/reflection.lux b/stdlib/source/library/lux/target/jvm/type/reflection.lux
index 69ace7d12..4c0cd90f6 100644
--- a/stdlib/source/library/lux/target/jvm/type/reflection.lux
+++ b/stdlib/source/library/lux/target/jvm/type/reflection.lux
@@ -8,7 +8,7 @@
      ["%" format (.only format)]]]
    [type
     [primitive (.full)]]]]
- ["[0]" // "_"
+ ["[0]" //
   [category (.only Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
   ["[1][0]" descriptor]
   [//
diff --git a/stdlib/source/library/lux/target/jvm/type/signature.lux b/stdlib/source/library/lux/target/jvm/type/signature.lux
index 442dfc471..c9b50a733 100644
--- a/stdlib/source/library/lux/target/jvm/type/signature.lux
+++ b/stdlib/source/library/lux/target/jvm/type/signature.lux
@@ -13,10 +13,10 @@
      ["[0]" list ("[1]#[0]" functor)]]]
    [type
     [primitive (.full)]]]]
- ["[0]" // "_"
+ ["[0]" //
   [category (.only Void Value Return Method Primitive Object Class Array Var Parameter Declaration Inheritance)]
   ["[1][0]" descriptor]
-  ["/[1]" // "_"
+  ["/[1]" //
    [encoding
     ["[1][0]" name (.only External)]]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/version.lux b/stdlib/source/library/lux/target/jvm/version.lux
index f6c6a4d9e..f6b4a52b5 100644
--- a/stdlib/source/library/lux/target/jvm/version.lux
+++ b/stdlib/source/library/lux/target/jvm/version.lux
@@ -3,7 +3,7 @@
   [lux (.full)
    [control
     ["[0]" try]]]]
- ["[0]" // "_"
+ ["[0]" //
   [encoding
    ["[1][0]" unsigned (.only U2)]]])
 
diff --git a/stdlib/source/library/lux/target/lua.lux b/stdlib/source/library/lux/target/lua.lux
index 438783654..e0bed2c3c 100644
--- a/stdlib/source/library/lux/target/lua.lux
+++ b/stdlib/source/library/lux/target/lua.lux
@@ -11,7 +11,7 @@
     [parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor mix)]]]
@@ -25,7 +25,7 @@
      ["i" int]
      ["f" frac]]]
    [type
-    [primitive (.full)]]]])
+    [primitive (.except)]]]])
 
 ... Added the carriage return for better Windows compatibility.
 (def: \n+
diff --git a/stdlib/source/library/lux/target/php.lux b/stdlib/source/library/lux/target/php.lux
index 735527266..7b9cec65a 100644
--- a/stdlib/source/library/lux/target/php.lux
+++ b/stdlib/source/library/lux/target/php.lux
@@ -11,7 +11,7 @@
     [parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor mix)]]]
@@ -24,7 +24,7 @@
      ["n" nat]
      ["f" frac]]]
    [type
-    [primitive (.full)]]]])
+    [primitive (.except)]]]])
 
 (def: input_separator ", ")
 (def: statement_suffix ";")
diff --git a/stdlib/source/library/lux/target/python.lux b/stdlib/source/library/lux/target/python.lux
index aaeb64459..91544c4b6 100644
--- a/stdlib/source/library/lux/target/python.lux
+++ b/stdlib/source/library/lux/target/python.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.except Location Code not or and list if int comment exec try the is)
+  [lux (.except Location Code not or and list if int comment exec try the is none)
    ["@" target]
    ["[0]" ffi]
    [abstract
@@ -12,7 +12,7 @@
     [parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor mix)]]]
@@ -25,7 +25,7 @@
      ["n" nat]
      ["f" frac]]]
    [type
-    [primitive (.full)]]]])
+    [primitive (.except)]]]])
 
 (def: input_separator
   ", ")
diff --git a/stdlib/source/library/lux/target/ruby.lux b/stdlib/source/library/lux/target/ruby.lux
index 4932ca58b..a157e513b 100644
--- a/stdlib/source/library/lux/target/ruby.lux
+++ b/stdlib/source/library/lux/target/ruby.lux
@@ -11,7 +11,7 @@
     [parser
      ["<[0]>" code]]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor mix)]]]
@@ -24,7 +24,7 @@
      ["n" nat]
      ["f" frac]]]
    [type
-    [primitive (.full)]]]])
+    [primitive (.except)]]]])
 
 (def: input_separator ", ")
 (def: statement_suffix ";")
diff --git a/stdlib/source/library/lux/target/scheme.lux b/stdlib/source/library/lux/target/scheme.lux
index 83651723a..e3e6fb09b 100644
--- a/stdlib/source/library/lux/target/scheme.lux
+++ b/stdlib/source/library/lux/target/scheme.lux
@@ -8,7 +8,7 @@
    [control
     ["[0]" pipe]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor monoid)]]]
@@ -19,7 +19,7 @@
      ["n" nat]
      ["f" frac]]]
    [type
-    [primitive (.full)]]]])
+    [primitive (.except)]]]])
 
 ... Added the carriage return for better Windows compatibility.
 (def: \n+