From f2281b48e6771de3599a5557d8a27c49a34e77e7 Mon Sep 17 00:00:00 2001
From: "Brian R. Murphy" <132495859+brmataptos@users.noreply.github.com>
Date: Tue, 3 Dec 2024 23:22:37 -0800
Subject: [PATCH] update some test outputs

---
 .../lambda/storable/closure_args.lambda.exp   | 242 +++++++++---------
 .../tests/sources/functional/restrictions.exp |   4 +-
 .../sources/functional/restrictions.v2_exp    |   4 +-
 3 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/third_party/move/move-compiler-v2/tests/lambda/storable/closure_args.lambda.exp b/third_party/move/move-compiler-v2/tests/lambda/storable/closure_args.lambda.exp
index 4eb52de9bb6065..faf6b4e48d3d47 100644
--- a/third_party/move/move-compiler-v2/tests/lambda/storable/closure_args.lambda.exp
+++ b/third_party/move/move-compiler-v2/tests/lambda/storable/closure_args.lambda.exp
@@ -40,7 +40,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -83,7 +83,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -93,7 +93,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -136,7 +136,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -146,7 +146,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -189,7 +189,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -199,7 +199,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -258,7 +258,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -311,7 +311,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -364,7 +364,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -417,7 +417,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -505,7 +505,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -548,7 +548,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -558,7 +558,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -601,7 +601,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -611,7 +611,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -654,7 +654,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -664,7 +664,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -723,7 +723,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -776,7 +776,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -829,7 +829,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -882,7 +882,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -970,7 +970,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -1013,7 +1013,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -1023,7 +1023,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -1066,7 +1066,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -1076,7 +1076,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -1119,7 +1119,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -1129,7 +1129,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -1188,7 +1188,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -1241,7 +1241,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -1294,7 +1294,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -1347,7 +1347,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -1435,7 +1435,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -1478,7 +1478,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -1488,7 +1488,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -1531,7 +1531,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -1541,7 +1541,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -1584,7 +1584,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -1594,7 +1594,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -1653,7 +1653,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -1706,7 +1706,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -1759,7 +1759,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -1812,7 +1812,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -1900,7 +1900,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -1943,7 +1943,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -1953,7 +1953,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -1996,7 +1996,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -2006,7 +2006,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -2049,7 +2049,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -2059,7 +2059,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -2118,7 +2118,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -2171,7 +2171,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -2224,7 +2224,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -2277,7 +2277,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -2365,7 +2365,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -2408,7 +2408,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -2418,7 +2418,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -2461,7 +2461,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -2471,7 +2471,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -2514,7 +2514,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -2524,7 +2524,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -2583,7 +2583,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -2636,7 +2636,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -2689,7 +2689,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -2742,7 +2742,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -2830,7 +2830,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -2873,7 +2873,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -2883,7 +2883,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -2926,7 +2926,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -2936,7 +2936,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -2979,7 +2979,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -2989,7 +2989,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -3048,7 +3048,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -3101,7 +3101,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -3154,7 +3154,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -3207,7 +3207,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -3295,7 +3295,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -3338,7 +3338,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -3348,7 +3348,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -3391,7 +3391,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -3401,7 +3401,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -3444,7 +3444,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -3454,7 +3454,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -3513,7 +3513,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -3566,7 +3566,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -3619,7 +3619,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -3672,7 +3672,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -3760,7 +3760,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -3803,7 +3803,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -3813,7 +3813,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -3856,7 +3856,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -3866,7 +3866,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -3909,7 +3909,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -3919,7 +3919,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -3978,7 +3978,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -4031,7 +4031,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -4084,7 +4084,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -4137,7 +4137,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -4225,7 +4225,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -4268,7 +4268,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -4278,7 +4278,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -4321,7 +4321,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -4331,7 +4331,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -4374,7 +4374,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -4384,7 +4384,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -4443,7 +4443,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x)
@@ -4496,7 +4496,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop, store
@@ -4549,7 +4549,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with copy, drop
@@ -4602,7 +4602,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                     {
                       let x: u64 = 3;
                        move|x: u64| mod1::base_fun(a, x) with drop, store
@@ -4690,7 +4690,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                      move|x: u64| mod1::base_fun(a, x)
                   } else {
                     if Eq<u64>(key, 1) {
@@ -4730,7 +4730,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+drop+store {
+    public fun return_function_both(key: u64,x: u64): |u64|u64 with copy+store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -4740,7 +4740,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                      move|x: u64| mod1::base_fun(a, x) with copy, drop, store
                   } else {
                     if Eq<u64>(key, 1) {
@@ -4780,7 +4780,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy+drop {
+    public fun return_function_copy(key: u64,x: u64): |u64|u64 with copy {
         {
           let a: S = pack mod1::S(2);
           {
@@ -4790,7 +4790,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                      move|x: u64| mod1::base_fun(a, x) with copy, drop
                   } else {
                     if Eq<u64>(key, 1) {
@@ -4830,7 +4830,7 @@ module 0x42::mod1 {
           }
         }
     }
-    public fun return_function_store(key: u64,x: u64): |u64|u64 with drop+store {
+    public fun return_function_store(key: u64,x: u64): |u64|u64 with store {
         {
           let a: S = pack mod1::S(2);
           {
@@ -4840,7 +4840,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                      move|x: u64| mod1::base_fun(a, x) with drop, store
                   } else {
                     if Eq<u64>(key, 1) {
@@ -4896,7 +4896,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                      move|x: u64| mod1::base_fun(a, x)
                   } else {
                     if Eq<u64>(key, 1) {
@@ -4946,7 +4946,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                      move|x: u64| mod1::base_fun(a, x) with copy, drop, store
                   } else {
                     if Eq<u64>(key, 1) {
@@ -4996,7 +4996,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                      move|x: u64| mod1::base_fun(a, x) with copy, drop
                   } else {
                     if Eq<u64>(key, 1) {
@@ -5046,7 +5046,7 @@ module 0x42::mod1 {
               {
                 let a_both: Sboth = pack mod1::Sboth(2);
                 {
-                  let f: |u64|u64 with copy+drop+store = if Eq<u64>(key, 0) {
+                  let f: |u64|u64 with copy+store = if Eq<u64>(key, 0) {
                      move|x: u64| mod1::base_fun(a, x) with drop, store
                   } else {
                     if Eq<u64>(key, 1) {
diff --git a/third_party/move/move-prover/tests/sources/functional/restrictions.exp b/third_party/move/move-prover/tests/sources/functional/restrictions.exp
index 947924207b0ce3..bcc3d281dd599b 100644
--- a/third_party/move/move-prover/tests/sources/functional/restrictions.exp
+++ b/third_party/move/move-prover/tests/sources/functional/restrictions.exp
@@ -1,11 +1,11 @@
 Move prover returns: exiting with condition generation errors
-error: [boogie translator] function or tuple result type not yet supported
+error: [boogie translator] tuple result type not yet supported
   ┌─ tests/sources/functional/restrictions.move:9:9
   │
 9 │         fun f1(): (u64, u64) { (1u64, 2u64) }
   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: [boogie translator] function or tuple result type not yet supported
+error: [boogie translator] function result type not yet supported
    ┌─ tests/sources/functional/restrictions.move:12:9
    │
 12 │         fun f2(): | |num { | | 1 }
diff --git a/third_party/move/move-prover/tests/sources/functional/restrictions.v2_exp b/third_party/move/move-prover/tests/sources/functional/restrictions.v2_exp
index 947924207b0ce3..bcc3d281dd599b 100644
--- a/third_party/move/move-prover/tests/sources/functional/restrictions.v2_exp
+++ b/third_party/move/move-prover/tests/sources/functional/restrictions.v2_exp
@@ -1,11 +1,11 @@
 Move prover returns: exiting with condition generation errors
-error: [boogie translator] function or tuple result type not yet supported
+error: [boogie translator] tuple result type not yet supported
   ┌─ tests/sources/functional/restrictions.move:9:9
   │
 9 │         fun f1(): (u64, u64) { (1u64, 2u64) }
   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: [boogie translator] function or tuple result type not yet supported
+error: [boogie translator] function result type not yet supported
    ┌─ tests/sources/functional/restrictions.move:12:9
    │
 12 │         fun f2(): | |num { | | 1 }