4 files changed, 31 insertions, 50 deletions
diff --git a/rules/CC/foreign/RULES b/rules/CC/foreign/RULES
index 935d477..e6463f8 100644
--- a/rules/CC/foreign/RULES
+++ b/rules/CC/foreign/RULES
@@ -31,7 +31,6 @@
     , "base-provides-++": ["./", "..", "defaults-base-provides-++"]
     , "base-provides-list": ["./", "..", "defaults-base-provides-list"]
     , "artifacts_list": ["./", "../..", "field_artifacts_list"]
-    , "nub_left": ["", "nub_left"]
     , "for host": ["transitions", "for host"]
     }
   , "config_transitions":
@@ -60,17 +59,14 @@
         ]
       , ["provider", "PATH"]
       , [ "PATH"
-        , { "type": "++"
+        , { "type": "nub_left"
           , "$1":
-            [ {"type": "var", "name": "PATH"}
-            , {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
-            ]
-          }
-        ]
-      , [ "PATH"
-        , { "type": "let*"
-          , "bindings": [["list", {"type": "var", "name": "PATH"}]]
-          , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"}
+            { "type": "++"
+            , "$1":
+              [ {"type": "var", "name": "PATH"}
+              , {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
+              ]
+            }
           }
         ]
       , ["provider", "ENV"]
diff --git a/rules/CC/foreign/cmake/EXPRESSIONS b/rules/CC/foreign/cmake/EXPRESSIONS
index c8f6dc1..a36725b 100644
--- a/rules/CC/foreign/cmake/EXPRESSIONS
+++ b/rules/CC/foreign/cmake/EXPRESSIONS
@@ -28,7 +28,6 @@
     ]
   , "imports":
     { "artifacts": ["", "field_artifacts"]
-    , "nub_left": ["", "nub_left"]
     , "flags-cc": ["CC", "flags-cc"]
     , "flags-cxx": ["CC", "flags-cxx"]
     , "compiler-cc": ["CC", "compiler-cc"]
@@ -228,18 +227,14 @@
         , { "type": "join"
           , "separator": ":"
           , "$1":
-            { "type": "let*"
-            , "bindings":
-              [ [ "list"
-                , { "type": "++"
-                  , "$1":
-                    [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"}
-                    , {"type": "CALL_EXPRESSION", "name": "default-PATH"}
-                    ]
-                  }
+            { "type": "nub_left"
+            , "$1":
+              { "type": "++"
+              , "$1":
+                [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"}
+                , {"type": "CALL_EXPRESSION", "name": "default-PATH"}
                 ]
-              ]
-            , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"}
+              }
             }
           }
         ]
diff --git a/rules/CC/foreign/make/EXPRESSIONS b/rules/CC/foreign/make/EXPRESSIONS
index 1707104..68aa728 100644
--- a/rules/CC/foreign/make/EXPRESSIONS
+++ b/rules/CC/foreign/make/EXPRESSIONS
@@ -30,7 +30,6 @@
     ]
   , "imports":
     { "artifacts": ["", "field_artifacts"]
-    , "nub_left": ["", "nub_left"]
     , "flags-cc": ["CC", "flags-cc"]
     , "flags-cxx": ["CC", "flags-cxx"]
     , "compiler-cc": ["CC", "compiler-cc"]
@@ -205,18 +204,14 @@
         , { "type": "join"
           , "separator": ":"
           , "$1":
-            { "type": "let*"
-            , "bindings":
-              [ [ "list"
-                , { "type": "++"
-                  , "$1":
-                    [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"}
-                    , {"type": "CALL_EXPRESSION", "name": "default-PATH"}
-                    ]
-                  }
+            { "type": "nub_left"
+            , "$1":
+              { "type": "++"
+              , "$1":
+                [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"}
+                , {"type": "CALL_EXPRESSION", "name": "default-PATH"}
                 ]
-              ]
-            , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"}
+              }
             }
           }
         ]
diff --git a/rules/CC/foreign/shell/EXPRESSIONS b/rules/CC/foreign/shell/EXPRESSIONS
index a1dcd0c..a37d315 100644
--- a/rules/CC/foreign/shell/EXPRESSIONS
+++ b/rules/CC/foreign/shell/EXPRESSIONS
@@ -22,7 +22,6 @@
     ]
   , "imports":
     { "artifacts": ["", "field_artifacts"]
-    , "nub_left": ["", "nub_left"]
     , "flags-cc": ["CC", "flags-cc"]
     , "flags-cxx": ["CC", "flags-cxx"]
     , "compiler-cc": ["CC", "compiler-cc"]
@@ -194,22 +193,18 @@
         , { "type": "join"
           , "separator": ":"
           , "$1":
-            { "type": "let*"
-            , "bindings":
-              [ [ "list"
-                , { "type": "++"
-                  , "$1":
-                    [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"}
-                    , {"type": "CALL_EXPRESSION", "name": "default-PATH"}
-                    , { "type": "let*"
-                      , "bindings": [["fieldname", "shell defaults"]]
-                      , "body": {"type": "CALL_EXPRESSION", "name": "sh-PATH"}
-                      }
-                    ]
+            { "type": "nub_left"
+            , "$1":
+              { "type": "++"
+              , "$1":
+                [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"}
+                , {"type": "CALL_EXPRESSION", "name": "default-PATH"}
+                , { "type": "let*"
+                  , "bindings": [["fieldname", "shell defaults"]]
+                  , "body": {"type": "CALL_EXPRESSION", "name": "sh-PATH"}
                   }
                 ]
-              ]
-            , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"}
+              }
             }
           }
         ]