diff --git a/crates/aiken-lang/src/gen_uplc/builder.rs b/crates/aiken-lang/src/gen_uplc/builder.rs
index cd83e8f3..39697b9d 100644
--- a/crates/aiken-lang/src/gen_uplc/builder.rs
+++ b/crates/aiken-lang/src/gen_uplc/builder.rs
@@ -433,11 +433,13 @@ pub fn identify_recursive_static_params(
     air_tree: &mut AirTree,
     tree_path: &TreePath,
     func_params: &[String],
-    func_key: &FunctionAccessKey,
-    variant: &String,
+    func_key: &(FunctionAccessKey, String),
+    function_calls_and_usage: &mut (usize, usize),
     shadowed_parameters: &mut HashMap<String, TreePath>,
     potential_recursive_statics: &mut Vec<String>,
 ) {
+    let variant = &func_key.1;
+    let func_key = &func_key.0;
     // Find whether any of the potential recursive statics get shadowed (because even if we pass in the same referenced name, it might not be static)
     for introduced_variable in find_introduced_variables(air_tree) {
         if potential_recursive_statics.contains(&introduced_variable) {
@@ -474,6 +476,26 @@ pub fn identify_recursive_static_params(
                 }
             }
         }
+        // This is a function call of a recursive function so track that
+        *function_calls_and_usage = (function_calls_and_usage.0 + 1, function_calls_and_usage.1);
+    } else if let AirTree::Var {
+        constructor:
+            ValueConstructor {
+                variant: ValueConstructorVariant::ModuleFn { name, module, .. },
+                ..
+            },
+        variant_name,
+        ..
+    } = air_tree
+    {
+        if name == &func_key.function_name
+            && module == &func_key.module_name
+            && variant == variant_name
+        {
+            // This is a usage of the recursive function either by call or being passed to a function or returned
+            *function_calls_and_usage =
+                (function_calls_and_usage.0, function_calls_and_usage.1 + 1);
+        }
     }
 }
 
@@ -488,14 +510,15 @@ pub fn modify_self_calls(
     // TODO: this would be a lot simpler if each `Var`, `Let`, function argument, etc. had a unique identifier
     // rather than just a name; this would let us track if the Var passed to itself was the same value as the method argument
     let mut shadowed_parameters: HashMap<String, TreePath> = HashMap::new();
+    let mut calls_and_var_usage = (0, 0);
     body.traverse_tree_with(
         &mut |air_tree: &mut AirTree, tree_path| {
             identify_recursive_static_params(
                 air_tree,
                 tree_path,
                 func_params,
-                func_key,
-                variant,
+                &(func_key.clone(), variant.clone()),
+                &mut calls_and_var_usage,
                 &mut shadowed_parameters,
                 &mut potential_recursive_statics,
             );
@@ -515,42 +538,79 @@ pub fn modify_self_calls(
     // Modify any self calls to remove recursive static parameters and append `self` as a parameter for the recursion
     body.traverse_tree_with(
         &mut |air_tree: &mut AirTree, _| {
-            if let AirTree::Call { func, args, .. } = air_tree {
-                if let AirTree::Var {
-                    constructor:
-                        ValueConstructor {
-                            variant: ValueConstructorVariant::ModuleFn { name, module, .. },
-                            ..
-                        },
-                    variant_name,
-                    ..
-                } = func.as_ref()
-                {
-                    if name == &func_key.function_name
-                        && module == &func_key.module_name
-                        && variant == variant_name
+            if let AirTree::Call {
+                func: func_recursive,
+                args,
+                ..
+            } = air_tree
+            {
+                if let AirTree::Call { func, .. } = func_recursive.as_ref() {
+                    if let AirTree::Var {
+                        constructor:
+                            ValueConstructor {
+                                variant: ValueConstructorVariant::ModuleFn { name, module, .. },
+                                ..
+                            },
+                        variant_name,
+                        ..
+                    } = func.as_ref()
                     {
-                        // Remove any static-recursive-parameters, because they'll be bound statically
-                        // above the recursive part of the function
-                        // note: assumes that static_recursive_params is sorted
-                        for arg in recursive_static_indexes.iter().rev() {
-                            args.remove(*arg);
+                        // The name must match and the recursive function must not be
+                        // passed around for this optimization to work.
+                        if name == &func_key.function_name
+                            && module == &func_key.module_name
+                            && variant == variant_name
+                            && calls_and_var_usage.0 == calls_and_var_usage.1
+                        {
+                            // Remove any static-recursive-parameters, because they'll be bound statically
+                            // above the recursive part of the function
+                            // note: assumes that static_recursive_params is sorted
+                            for arg in recursive_static_indexes.iter().rev() {
+                                args.remove(*arg);
+                            }
+                            args.insert(0, func.as_ref().clone());
+                            *func_recursive = func.as_ref().clone().into();
                         }
-                        let mut new_args = vec![func.as_ref().clone()];
-                        new_args.append(args);
-                        *args = new_args;
                     }
                 }
+            } else if let AirTree::Var {
+                constructor:
+                    ValueConstructor {
+                        variant: ValueConstructorVariant::ModuleFn { name, module, .. },
+                        ..
+                    },
+                variant_name,
+                ..
+            } = &air_tree
+            {
+                if name.clone() == func_key.function_name
+                    && module.clone() == func_key.module_name
+                    && variant.clone() == variant_name.clone()
+                {
+                    let self_call = AirTree::call(
+                        air_tree.clone(),
+                        air_tree.return_type(),
+                        vec![air_tree.clone()],
+                    );
+
+                    *air_tree = self_call;
+                }
             }
         },
         true,
     );
-    let recursive_nonstatics = func_params
-        .iter()
-        .filter(|p| !potential_recursive_statics.contains(p))
-        .cloned()
-        .collect();
-    recursive_nonstatics
+
+    // In the case of equal calls to usage we can reduce the static params
+    if calls_and_var_usage.0 == calls_and_var_usage.1 {
+        let recursive_nonstatics = func_params
+            .iter()
+            .filter(|p| !potential_recursive_statics.contains(p))
+            .cloned()
+            .collect();
+        recursive_nonstatics
+    } else {
+        func_params.to_vec()
+    }
 }
 
 pub fn modify_cyclic_calls(
diff --git a/examples/acceptance_tests/036/aiken.lock b/examples/acceptance_tests/036/aiken.lock
index dc57beef..2658f9e4 100644
--- a/examples/acceptance_tests/036/aiken.lock
+++ b/examples/acceptance_tests/036/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723088177, nanos_since_epoch = 617705000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158432, nanos_since_epoch = 10066000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/036/plutus.json b/examples/acceptance_tests/036/plutus.json
index c2bcb03d..a91e2dcc 100644
--- a/examples/acceptance_tests/036/plutus.json
+++ b/examples/acceptance_tests/036/plutus.json
@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+650b853"
+      "version": "v1.0.31-alpha+6e4a16d"
     }
   },
   "validators": [
diff --git a/examples/acceptance_tests/047/plutus.json b/examples/acceptance_tests/047/plutus.json
index 78acd808..9a9241cf 100644
--- a/examples/acceptance_tests/047/plutus.json
+++ b/examples/acceptance_tests/047/plutus.json
@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     }
   },
   "validators": [
diff --git a/examples/acceptance_tests/054/aiken.lock b/examples/acceptance_tests/054/aiken.lock
index 8106697d..ab10346d 100644
--- a/examples/acceptance_tests/054/aiken.lock
+++ b/examples/acceptance_tests/054/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053744, nanos_since_epoch = 59150000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158433, nanos_since_epoch = 380614000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/055/aiken.lock b/examples/acceptance_tests/055/aiken.lock
index 5e1a3774..ea1d982e 100644
--- a/examples/acceptance_tests/055/aiken.lock
+++ b/examples/acceptance_tests/055/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053741, nanos_since_epoch = 320155000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 363713000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/061/aiken.lock b/examples/acceptance_tests/061/aiken.lock
index 738e6411..e97629d8 100644
--- a/examples/acceptance_tests/061/aiken.lock
+++ b/examples/acceptance_tests/061/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053745, nanos_since_epoch = 634461000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158434, nanos_since_epoch = 837171000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/063/aiken.lock b/examples/acceptance_tests/063/aiken.lock
index c5e9b538..dfc444cc 100644
--- a/examples/acceptance_tests/063/aiken.lock
+++ b/examples/acceptance_tests/063/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053743, nanos_since_epoch = 980113000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 367316000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/067/aiken.lock b/examples/acceptance_tests/067/aiken.lock
index 21d2b3f8..7025114f 100644
--- a/examples/acceptance_tests/067/aiken.lock
+++ b/examples/acceptance_tests/067/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053741, nanos_since_epoch = 323652000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158436, nanos_since_epoch = 571367000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/068/aiken.lock b/examples/acceptance_tests/068/aiken.lock
index 1b5477b9..673e5077 100644
--- a/examples/acceptance_tests/068/aiken.lock
+++ b/examples/acceptance_tests/068/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053745, nanos_since_epoch = 935261000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158436, nanos_since_epoch = 551807000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/069/aiken.lock b/examples/acceptance_tests/069/aiken.lock
index 854c8a71..bef9546a 100644
--- a/examples/acceptance_tests/069/aiken.lock
+++ b/examples/acceptance_tests/069/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053746, nanos_since_epoch = 143077000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 941669000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/070/aiken.lock b/examples/acceptance_tests/070/aiken.lock
index 8acf5aa5..de287192 100644
--- a/examples/acceptance_tests/070/aiken.lock
+++ b/examples/acceptance_tests/070/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053742, nanos_since_epoch = 886783000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158437, nanos_since_epoch = 43333000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/071/aiken.lock b/examples/acceptance_tests/071/aiken.lock
index e570a7c3..57177e6b 100644
--- a/examples/acceptance_tests/071/aiken.lock
+++ b/examples/acceptance_tests/071/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053741, nanos_since_epoch = 320950000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158434, nanos_since_epoch = 487166000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/071/plutus.json b/examples/acceptance_tests/071/plutus.json
index 97863093..1405ea1c 100644
--- a/examples/acceptance_tests/071/plutus.json
+++ b/examples/acceptance_tests/071/plutus.json
@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     }
   },
   "validators": [
diff --git a/examples/acceptance_tests/072/aiken.lock b/examples/acceptance_tests/072/aiken.lock
index 7c88cc8c..a26c777c 100644
--- a/examples/acceptance_tests/072/aiken.lock
+++ b/examples/acceptance_tests/072/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053746, nanos_since_epoch = 75454000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158434, nanos_since_epoch = 466737000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/073/aiken.lock b/examples/acceptance_tests/073/aiken.lock
index 80932dc1..ebd1a468 100644
--- a/examples/acceptance_tests/073/aiken.lock
+++ b/examples/acceptance_tests/073/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053742, nanos_since_epoch = 178796000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158432, nanos_since_epoch = 54533000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/074/aiken.lock b/examples/acceptance_tests/074/aiken.lock
index e5144f78..71a198e4 100644
--- a/examples/acceptance_tests/074/aiken.lock
+++ b/examples/acceptance_tests/074/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053745, nanos_since_epoch = 305836000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158437, nanos_since_epoch = 127361000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/077/aiken.lock b/examples/acceptance_tests/077/aiken.lock
index 956cbf98..0687e2d9 100644
--- a/examples/acceptance_tests/077/aiken.lock
+++ b/examples/acceptance_tests/077/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053743, nanos_since_epoch = 48582000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 59914000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/077/plutus.json b/examples/acceptance_tests/077/plutus.json
index aaf57213..9e1b743c 100644
--- a/examples/acceptance_tests/077/plutus.json
+++ b/examples/acceptance_tests/077/plutus.json
@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     }
   },
   "validators": [
diff --git a/examples/acceptance_tests/079/plutus.json b/examples/acceptance_tests/079/plutus.json
index 270d667f..ffb53e6f 100644
--- a/examples/acceptance_tests/079/plutus.json
+++ b/examples/acceptance_tests/079/plutus.json
@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     }
   },
   "validators": [
diff --git a/examples/acceptance_tests/082/aiken.lock b/examples/acceptance_tests/082/aiken.lock
index bf48674d..46af44a9 100644
--- a/examples/acceptance_tests/082/aiken.lock
+++ b/examples/acceptance_tests/082/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053743, nanos_since_epoch = 766123000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158431, nanos_since_epoch = 785683000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/083/aiken.lock b/examples/acceptance_tests/083/aiken.lock
index 08f4daba..55a88468 100644
--- a/examples/acceptance_tests/083/aiken.lock
+++ b/examples/acceptance_tests/083/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053741, nanos_since_epoch = 684139000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158433, nanos_since_epoch = 377116000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/084/aiken.lock b/examples/acceptance_tests/084/aiken.lock
index 55e834c3..3df326f9 100644
--- a/examples/acceptance_tests/084/aiken.lock
+++ b/examples/acceptance_tests/084/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053744, nanos_since_epoch = 433315000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158433, nanos_since_epoch = 339674000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/086/aiken.lock b/examples/acceptance_tests/086/aiken.lock
index 7a6b5a1c..fb9b4ac9 100644
--- a/examples/acceptance_tests/086/aiken.lock
+++ b/examples/acceptance_tests/086/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053744, nanos_since_epoch = 904229000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158437, nanos_since_epoch = 77334000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/086/plutus.json b/examples/acceptance_tests/086/plutus.json
index 0aa2db59..a5177998 100644
--- a/examples/acceptance_tests/086/plutus.json
+++ b/examples/acceptance_tests/086/plutus.json
@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     }
   },
   "validators": [
diff --git a/examples/acceptance_tests/087/aiken.lock b/examples/acceptance_tests/087/aiken.lock
index 6684f3e3..c422013d 100644
--- a/examples/acceptance_tests/087/aiken.lock
+++ b/examples/acceptance_tests/087/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053744, nanos_since_epoch = 446040000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 341686000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/088/aiken.lock b/examples/acceptance_tests/088/aiken.lock
index 2599bb90..bf6a6289 100644
--- a/examples/acceptance_tests/088/aiken.lock
+++ b/examples/acceptance_tests/088/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053741, nanos_since_epoch = 321730000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158431, nanos_since_epoch = 948979000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/089/aiken.lock b/examples/acceptance_tests/089/aiken.lock
index 67f48701..f58439fc 100644
--- a/examples/acceptance_tests/089/aiken.lock
+++ b/examples/acceptance_tests/089/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053745, nanos_since_epoch = 212209000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 937845000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/089/plutus.json b/examples/acceptance_tests/089/plutus.json
index 9acc530f..ddbfddbb 100644
--- a/examples/acceptance_tests/089/plutus.json
+++ b/examples/acceptance_tests/089/plutus.json
@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     }
   },
   "validators": [
diff --git a/examples/acceptance_tests/090/plutus.json b/examples/acceptance_tests/090/plutus.json
index 1eb661e4..2408316c 100644
--- a/examples/acceptance_tests/090/plutus.json
+++ b/examples/acceptance_tests/090/plutus.json
@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     }
   },
   "validators": [
diff --git a/examples/acceptance_tests/096/aiken.lock b/examples/acceptance_tests/096/aiken.lock
index 546e3a16..875510d7 100644
--- a/examples/acceptance_tests/096/aiken.lock
+++ b/examples/acceptance_tests/096/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053742, nanos_since_epoch = 138704000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158436, nanos_since_epoch = 833716000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/096/plutus.json b/examples/acceptance_tests/096/plutus.json
index f1bcc947..b0c3be36 100644
--- a/examples/acceptance_tests/096/plutus.json
+++ b/examples/acceptance_tests/096/plutus.json
@@ -6,7 +6,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     },
     "license": "Apache-2.0"
   },
diff --git a/examples/acceptance_tests/099/aiken.lock b/examples/acceptance_tests/099/aiken.lock
index 722ec7e7..58c9fa00 100644
--- a/examples/acceptance_tests/099/aiken.lock
+++ b/examples/acceptance_tests/099/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053742, nanos_since_epoch = 163400000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158436, nanos_since_epoch = 95704000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/101/aiken.lock b/examples/acceptance_tests/101/aiken.lock
index ce925a07..da2cd68d 100644
--- a/examples/acceptance_tests/101/aiken.lock
+++ b/examples/acceptance_tests/101/aiken.lock
@@ -24,5 +24,5 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1723053742, nanos_since_epoch = 375481000 }, "24d601fa19a2002318495bbb8562b9677563ca1b5c03126d6b093a65df076bef"]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053742, nanos_since_epoch = 141032000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1723158434, nanos_since_epoch = 581622000 }, "24d601fa19a2002318495bbb8562b9677563ca1b5c03126d6b093a65df076bef"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158434, nanos_since_epoch = 474753000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/102/aiken.lock b/examples/acceptance_tests/102/aiken.lock
index f7e58658..460ae0a3 100644
--- a/examples/acceptance_tests/102/aiken.lock
+++ b/examples/acceptance_tests/102/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053743, nanos_since_epoch = 59195000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158431, nanos_since_epoch = 792706000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/104/aiken.lock b/examples/acceptance_tests/104/aiken.lock
index e50f205a..952e6b14 100644
--- a/examples/acceptance_tests/104/aiken.lock
+++ b/examples/acceptance_tests/104/aiken.lock
@@ -24,5 +24,5 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1723053744, nanos_since_epoch = 103962000 }, "24d601fa19a2002318495bbb8562b9677563ca1b5c03126d6b093a65df076bef"]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053743, nanos_since_epoch = 995320000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1723158432, nanos_since_epoch = 675720000 }, "24d601fa19a2002318495bbb8562b9677563ca1b5c03126d6b093a65df076bef"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158432, nanos_since_epoch = 474723000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/104/plutus.json b/examples/acceptance_tests/104/plutus.json
index 2fdbfc94..ddb8f0bd 100644
--- a/examples/acceptance_tests/104/plutus.json
+++ b/examples/acceptance_tests/104/plutus.json
@@ -6,7 +6,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     },
     "license": "Apache-2.0"
   },
diff --git a/examples/acceptance_tests/108/aiken.lock b/examples/acceptance_tests/108/aiken.lock
new file mode 100644
index 00000000..6e350cda
--- /dev/null
+++ b/examples/acceptance_tests/108/aiken.lock
@@ -0,0 +1,7 @@
+# This file was generated by Aiken
+# You typically do not need to edit this file
+
+requirements = []
+packages = []
+
+[etags]
diff --git a/examples/acceptance_tests/108/aiken.toml b/examples/acceptance_tests/108/aiken.toml
new file mode 100644
index 00000000..8823803a
--- /dev/null
+++ b/examples/acceptance_tests/108/aiken.toml
@@ -0,0 +1,9 @@
+name = "aiken-lang/108"
+version = "0.0.0"
+license = "Apache-2.0"
+description = "Aiken contracts for project 'aiken-lang/108'"
+
+[repository]
+user = "aiken-lang"
+project = "108"
+platform = "github"
diff --git a/examples/acceptance_tests/108/lib/tests.ak b/examples/acceptance_tests/108/lib/tests.ak
new file mode 100644
index 00000000..8dc074fa
--- /dev/null
+++ b/examples/acceptance_tests/108/lib/tests.ak
@@ -0,0 +1,44 @@
+use aiken/builtin
+
+pub fn reduce(xs: List<a>, zero: b, do: fn(a, b) -> b) -> b {
+  when xs is {
+    [] -> zero
+    [head, ..tail] -> do(head, reduce(tail, zero, do))
+  }
+}
+
+pub fn inspect_1(self: Data, result: result) -> result {
+  builtin.choose_data(
+    self,
+    fail,
+    fail,
+    reduce(builtin.un_list_data(self), result, fn(a, b) { inspect_1(a, b) }),
+    {
+      trace @"int"
+      result
+    },
+    fail,
+  )
+}
+
+test as_lambda() {
+  inspect_1([14, 42], True)
+}
+
+pub fn inspect_2(self: Data, result: result) -> result {
+  builtin.choose_data(
+    self,
+    fail,
+    fail,
+    reduce(builtin.un_list_data(self), result, inspect_2),
+    {
+      trace @"int"
+      result
+    },
+    fail,
+  )
+}
+
+test as_identifier() {
+  inspect_2([14, 42], True)
+}
diff --git a/examples/acceptance_tests/script_context/aiken.lock b/examples/acceptance_tests/script_context/aiken.lock
index 88c9fd39..a1284437 100644
--- a/examples/acceptance_tests/script_context/aiken.lock
+++ b/examples/acceptance_tests/script_context/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723053748, nanos_since_epoch = 53624000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158439, nanos_since_epoch = 196168000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"]
diff --git a/examples/acceptance_tests/script_context/plutus.json b/examples/acceptance_tests/script_context/plutus.json
index 5466b401..d0956347 100644
--- a/examples/acceptance_tests/script_context/plutus.json
+++ b/examples/acceptance_tests/script_context/plutus.json
@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+3aa9eb5"
+      "version": "v1.0.31-alpha+6e4a16d"
     }
   },
   "validators": [