11 files changed, 28 insertions, 31 deletions
diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux
index 734a31c7c..72473bbe9 100644
--- a/stdlib/source/program/aedifex.lux
+++ b/stdlib/source/program/aedifex.lux
@@ -9,7 +9,7 @@
     ["[0]" io (.only IO)]
     ["[0]" maybe]
     ["[0]" try (.only Try) (.use "[1]#[0]" functor)]
-    ["[0]" exception (.only exception:)]
+    ["[0]" exception (.only exception)]
     [parser
      [environment (.only Environment)]]
     [concurrency
@@ -96,8 +96,8 @@
            (in {try.#Failure ""})))]
     (in output)))
 
-(exception: (cannot_find_repository [repository Text
-                                     options (Dictionary Text Address)])
+(exception (cannot_find_repository [repository Text
+                                    options (Dictionary Text Address)])
   (exception.report
    "Repository" (%.text repository)
    "Options" (exception.listing (function (_ [name repo])
@@ -128,7 +128,7 @@
          (..fail! error))))
     (at io.monad in [])))
 
-(exception: .public invalid_operation)
+(exception .public invalid_operation)
 
 (`` (def write_only
       (Console IO)
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
index b039dd2e2..9acb04c63 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -5,7 +5,6 @@
     [equivalence (.only Equivalence)]
     [monad (.only do)]]
    [control
-    ["[0]" exception (.only exception:)]
     ["<>" parser]]
    [data
     ["[0]" text
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index f6ffea4d6..02b0d97f2 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -7,7 +7,7 @@
    [control
     ["<>" parser]
     ["[0]" try (.only Try)]
-    ["[0]" exception (.only exception:)]]
+    ["[0]" exception (.only exception)]]
    [data
     ["[0]" text
      ["%" \\format]
@@ -32,7 +32,7 @@
 (def min_year +1,000)
 (def max_year +9,999)
 
-(exception: .public (year_is_out_of_range [year year.Year])
+(exception .public (year_is_out_of_range [year year.Year])
   (exception.report
    "Minimum" (%.int ..min_year)
    "Maximum" (%.int ..max_year)
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 82dffcd61..53e6824f0 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -5,7 +5,6 @@
     [equivalence (.only Equivalence)]
     [monad (.only do)]]
    [control
-    ["[0]" exception (.only exception:)]
     ["<>" parser]]
    [data
     ["[0]" product]
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 2f1931c0e..69b5f9e40 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -7,7 +7,7 @@
     [monad (.only do)]]
    [control
     ["[0]" try (.only Try) (.use "[1]#[0]" functor)]
-    ["[0]" exception (.only exception:)]
+    ["[0]" exception (.only exception)]
     ["[0]" io (.only IO)]
     [concurrency
      ["[0]" async (.only Async) (.use "[1]#[0]" monad)]]]
@@ -81,8 +81,8 @@
   ["lux-ruby" ruby_lux_name]
   )
 
-(exception: .public no_available_lux)
-(exception: .public no_specified_program)
+(exception .public no_available_lux)
+(exception .public no_specified_program)
 
 (type .public Lux
   (Variant
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index d8c46d98c..eaefb1831 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -12,7 +12,7 @@
    [control
     ["[0]" maybe]
     ["[0]" try (.only Try) (.use "[1]#[0]" functor)]
-    ["[0]" exception (.only Exception exception:)]
+    ["[0]" exception (.only Exception exception)]
     [concurrency
      ["[0]" async (.only Async)]]]
    [data
@@ -58,9 +58,9 @@
     ["[1]/[0]" snapshot]]]])
 
 (with_template [<name>]
-  [(exception: .public (<name> [artifact Artifact
-                                extension Extension
-                                hash Text])
+  [(exception .public (<name> [artifact Artifact
+                               extension Extension
+                               hash Text])
      (exception.report
       "Artifact" (///artifact.format artifact)
       "Extension" (%.text extension)
@@ -154,7 +154,7 @@
   (Equivalence Resolution)
   (dictionary.equivalence ///package.equivalence))
 
-(exception: .public (cannot_resolve [dependency Dependency])
+(exception .public (cannot_resolve [dependency Dependency])
   (exception.report
    "Artifact" (%.text (///artifact.format (the //.#artifact dependency)))
    "Type" (%.text (the //.#type dependency))))
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index d114b957e..3f7376286 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -8,7 +8,7 @@
     [monad (.only do)]]
    [control
     ["[0]" try (.only Try)]
-    ["[0]" exception (.only exception:)]]
+    ["[0]" exception (.only exception)]]
    [data
     ["[0]" binary (.only Binary)]
     ["[0]" text
@@ -80,15 +80,15 @@
   (def hex_per_chunk
     (n.* hex_per_byte i64.bytes_per_i64))
 
-  (exception: .public (not_a_hash [size Nat
-                                   value Text])
+  (exception .public (not_a_hash [size Nat
+                                  value Text])
     (exception.report
      "Pseudo hash" (%.text value)
      "Expected size" (%.nat size)
      "Actual size" (%.nat (text.size value))))
   
   (with_template [<name> <size>]
-    [(exception: .public (<name> [data Binary])
+    [(exception .public (<name> [data Binary])
        (exception.report
         "Pseudo hash" (%.text (..encoded data))
         "Expected size" (%.nat <size>)
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 8898385f7..c524ddefb 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -5,10 +5,9 @@
     [monad (.only do)]
     [equivalence (.only Equivalence)]]
    [control
+    ["<>" parser]
     ["[0]" pipe]
     ["[0]" try (.only Try)]
-    ["[0]" exception (.only exception:)]
-    ["<>" parser]
     [concurrency
      ["[0]" async (.only Async)]]]
    [data
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index 3017defcd..ff8710893 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -6,7 +6,7 @@
     [equivalence (.only Equivalence)]]
    [control
     ["[0]" maybe (.use "[1]#[0]" monoid)]
-    ["[0]" exception (.only exception:)]]
+    ["[0]" exception (.only exception)]]
    [data
     ["[0]" product]
     ["[0]" text (.use "[1]#[0]" equivalence)]
@@ -277,4 +277,4 @@
         #lua (!runtime #lua runtime.default_lua)
         #ruby (!runtime #ruby runtime.default_ruby)]))))
 
-(exception: .public no_identity)
+(exception .public no_identity)
diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux
index ae6a4acdf..7be915cb1 100644
--- a/stdlib/source/program/aedifex/project.lux
+++ b/stdlib/source/program/aedifex/project.lux
@@ -7,7 +7,7 @@
     ["[0]" monad (.only do)]]
    [control
     ["[0]" try (.only Try)]
-    ["[0]" exception (.only exception:)]]
+    ["[0]" exception (.only exception)]]
    [data
     ["[0]" text (.only)
      ["%" \\format (.only format)]]
@@ -41,12 +41,12 @@
    (def composite
      (dictionary.composite_with (at //.monoid composite)))))
 
-(exception: .public (unknown_profile [name Name])
+(exception .public (unknown_profile [name Name])
   (exception.report
    "Name" (%.text name)))
 
-(exception: .public (circular_dependency [dependee Name
-                                          dependent Name])
+(exception .public (circular_dependency [dependee Name
+                                         dependent Name])
   (exception.report
    "Dependent" (%.text dependent)
    "Dependee" (%.text dependee)))
diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux
index 2414e25d8..75d9a3468 100644
--- a/stdlib/source/program/aedifex/repository/remote.lux
+++ b/stdlib/source/program/aedifex/repository/remote.lux
@@ -6,7 +6,7 @@
    [control
     ["[0]" io (.only IO)]
     ["[0]" try (.only Try)]
-    ["[0]" exception (.only exception:)]]
+    ["[0]" exception (.only exception)]]
    [data
     ["[0]" product]
     [text
@@ -35,8 +35,8 @@
   URL)
 
 (with_template [<name>]
-  [(exception: .public (<name> [url URL
-                                status Nat])
+  [(exception .public (<name> [url URL
+                               status Nat])
      (exception.report
       "URL" (%.text url)
       "Status Code" (%.nat status)))]