diff --git a/crates/cairo-lang-lowering/src/reorganize_blocks.rs b/crates/cairo-lang-lowering/src/reorganize_blocks.rs
index 0e9df00108d..aa2a9f275ca 100644
--- a/crates/cairo-lang-lowering/src/reorganize_blocks.rs
+++ b/crates/cairo-lang-lowering/src/reorganize_blocks.rs
@@ -127,13 +127,11 @@ impl Analyzer<'_> for TopSortContext {
         _info: &mut Self::Info,
         _statement_location: StatementLocation,
         target_block_id: BlockId,
-        remapping: &VarRemapping,
+        // Note that the remappings of a goto are not considered a usage, Later usages (such as a
+        // merge) would catch them if used.
+        _remapping: &VarRemapping,
     ) {
         self.incoming_gotos[target_block_id.0] += 1;
-
-        for var_usage in remapping.values() {
-            self.remappings_ctx.set_used(var_usage.var_id);
-        }
     }
 
     fn merge_match(
diff --git a/crates/cairo-lang-runner/src/profiling_test_data/profiling b/crates/cairo-lang-runner/src/profiling_test_data/profiling
index c7c5d732bff..6b82c06fa6a 100644
--- a/crates/cairo-lang-runner/src/profiling_test_data/profiling
+++ b/crates/cairo-lang-runner/src/profiling_test_data/profiling
@@ -49,29 +49,29 @@ Weight by sierra statement:
   statement 19: 4 (store_temp<test::MyEnum>([8]) -> ([8]))
   statement 20: 4 (store_temp<test::MyEnum>([13]) -> ([13]))
   statement 21: 4 (store_temp<test::MyEnum>([18]) -> ([18]))
-  statement 101: 4 (u8_overflowing_add([49], [75], [76]) { fallthrough([80], [81]) 151([82], [83]) })
-  statement 129: 4 (u8_overflowing_add([71], [97], [98]) { fallthrough([102], [103]) 139([104], [105]) })
-  statement 137: 3 (store_temp<core::panics::PanicResult::<((),)>>([109]) -> ([109]))
-  statement 50: 2 (enum_match<test::MyEnum>([8]) { fallthrough([41]) 56([42]) 62([43]) 68([44]) })
-  statement 78: 2 (enum_match<test::MyEnum>([13]) { fallthrough([63]) 84([64]) 90([65]) 96([66]) })
-  statement 106: 2 (enum_match<test::MyEnum>([18]) { fallthrough([85]) 112([86]) 118([87]) 124([88]) })
-  statement 22: 1 (enum_match<test::MyEnum>([4]) { fallthrough([19]) 28([20]) 34([21]) 40([22]) })
+  statement 89: 4 (u8_overflowing_add([41], [63], [64]) { fallthrough([68], [69]) 135([70], [71]) })
+  statement 113: 4 (u8_overflowing_add([59], [81], [82]) { fallthrough([86], [87]) 123([88], [89]) })
+  statement 121: 3 (store_temp<core::panics::PanicResult::<((),)>>([93]) -> ([93]))
+  statement 46: 2 (enum_match<test::MyEnum>([8]) { fallthrough([37]) 50([38]) 54([39]) 60([40]) })
+  statement 70: 2 (enum_match<test::MyEnum>([13]) { fallthrough([55]) 74([56]) 78([57]) 84([58]) })
+  statement 94: 2 (enum_match<test::MyEnum>([18]) { fallthrough([73]) 98([74]) 102([75]) 108([76]) })
+  statement 22: 1 (enum_match<test::MyEnum>([4]) { fallthrough([19]) 26([20]) 30([21]) 36([22]) })
   statement 23: 1 (branch_align() -> ())
-  statement 27: 1 (jump() { 32() })
-  statement 32: 1 (store_temp<RangeCheck>([0]) -> ([27]))
-  statement 33: 1 (jump() { 50() })
-  statement 56: 1 (branch_align() -> ())
-  statement 60: 1 (store_temp<RangeCheck>([27]) -> ([49]))
-  statement 61: 1 (jump() { 78() })
-  statement 93: 1 (store_temp<u8>([72]) -> ([75]))
-  statement 94: 1 (store_temp<u8>([74]) -> ([76]))
-  statement 95: 1 (jump() { 101() })
-  statement 105: 1 (store_temp<RangeCheck>([80]) -> ([71]))
-  statement 127: 1 (store_temp<u8>([99]) -> ([97]))
-  statement 128: 1 (store_temp<u8>([101]) -> ([98]))
-  statement 130: 1 (branch_align() -> ())
-  statement 133: 1 (store_temp<RangeCheck>([102]) -> ([93]))
-  statement 138: 1 (return([93], [109]))
+  statement 25: 1 (jump() { 28() })
+  statement 28: 1 (store_temp<RangeCheck>([0]) -> ([23]))
+  statement 29: 1 (jump() { 46() })
+  statement 50: 1 (branch_align() -> ())
+  statement 52: 1 (store_temp<RangeCheck>([23]) -> ([41]))
+  statement 53: 1 (jump() { 70() })
+  statement 81: 1 (store_temp<u8>([60]) -> ([63]))
+  statement 82: 1 (store_temp<u8>([62]) -> ([64]))
+  statement 83: 1 (jump() { 89() })
+  statement 93: 1 (store_temp<RangeCheck>([68]) -> ([59]))
+  statement 111: 1 (store_temp<u8>([83]) -> ([81]))
+  statement 112: 1 (store_temp<u8>([85]) -> ([82]))
+  statement 114: 1 (branch_align() -> ())
+  statement 117: 1 (store_temp<RangeCheck>([86]) -> ([77]))
+  statement 122: 1 (return([77], [93]))
 Weight by concrete libfunc:
   libfunc store_temp<test::MyEnum>: 16
   libfunc u8_overflowing_add: 8
@@ -94,9 +94,10 @@ Weight by user function (inc. generated):
 Weight by original user function (exc. generated):
   function test::main: 50
 Weight by Cairo function:
-  function lib.cairo::foo: 31
+  function lib.cairo::foo: 30
   function integer.cairo::U8Add::add: 11
   function lib.cairo::main: 8
+  function unknown: 1
 Weight by Sierra stack trace:
   test::main: 50
 Weight by Cairo stack trace:
diff --git a/crates/cairo-lang-sierra-generator/src/statement_location_test_data/simple b/crates/cairo-lang-sierra-generator/src/statement_location_test_data/simple
index bc7f84cb541..3696bc28cf0 100644
--- a/crates/cairo-lang-sierra-generator/src/statement_location_test_data/simple
+++ b/crates/cairo-lang-sierra-generator/src/statement_location_test_data/simple
@@ -526,20 +526,10 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<felt252, felt252>>([19]) -> ([23], [24])
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                  ^****^
-In function: lib.cairo::foo
-drop<felt252>([23]) -> ()
-
-drop<felt252>([24]) -> ()
+drop<Tuple<felt252, felt252>>([19]) -> ()
 
 jump() { label_test::main::5() }
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                  ^****^
-In function: lib.cairo::foo
+
 label_test::main::1:
 
 branch_align() -> ()
@@ -547,18 +537,11 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<felt252, felt252>>([20]) -> ([25], [26])
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                                      ^****^
-In function: lib.cairo::foo
-drop<felt252>([25]) -> ()
-
-drop<felt252>([26]) -> ()
+drop<Tuple<felt252, felt252>>([20]) -> ()
 
 label_test::main::5:
 
-store_temp<RangeCheck>([0]) -> ([27])
+store_temp<RangeCheck>([0]) -> ([23])
 Originating location:
 fn main() {
 ^*********^
@@ -575,19 +558,19 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<u8, u8, u8>>([21]) -> ([28], [29], [30])
+struct_deconstruct<Tuple<u8, u8, u8>>([21]) -> ([24], [25], [26])
 Originating location:
         MyEnum::C((x, _, t)) | MyEnum::D(P { x, y: _, z: t }) => (x + t).into(),
                   ^*******^
 In function: lib.cairo::foo
-drop<u8>([29]) -> ()
+drop<u8>([25]) -> ()
 
-store_temp<u8>([28]) -> ([31])
+store_temp<u8>([24]) -> ([27])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-store_temp<u8>([30]) -> ([32])
+store_temp<u8>([26]) -> ([28])
 Originating location:
     match a {
     ^*******^
@@ -604,26 +587,26 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<test::P>([22]) -> ([33], [34], [35])
+struct_deconstruct<test::P>([22]) -> ([29], [30], [31])
 Originating location:
         MyEnum::C((x, _, t)) | MyEnum::D(P { x, y: _, z: t }) => (x + t).into(),
                                          ^*****************^
 In function: lib.cairo::foo
-drop<u8>([34]) -> ()
+drop<u8>([30]) -> ()
 
-store_temp<u8>([33]) -> ([31])
+store_temp<u8>([29]) -> ([27])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-store_temp<u8>([35]) -> ([32])
+store_temp<u8>([31]) -> ([28])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
 label_test::main::7:
 
-u8_overflowing_add([0], [31], [32]) { fallthrough([36], [37]) label_test::main::8([38], [39]) }
+u8_overflowing_add([0], [27], [28]) { fallthrough([32], [33]) label_test::main::8([34], [35]) }
 Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
@@ -633,21 +616,21 @@ Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
-u8_to_felt252([37]) -> ([40])
+u8_to_felt252([33]) -> ([36])
 Originating location:
         u8_to_felt252(self)
         ^*****************^
 In function: integer.cairo::U8IntoFelt252::into
-drop<felt252>([40]) -> ()
+drop<felt252>([36]) -> ()
 
-store_temp<RangeCheck>([36]) -> ([27])
+store_temp<RangeCheck>([32]) -> ([23])
 Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
 label_test::main::6:
 
-enum_match<test::MyEnum>([8]) { fallthrough([41]) label_test::main::10([42]) label_test::main::11([43]) label_test::main::12([44]) }
+enum_match<test::MyEnum>([8]) { fallthrough([37]) label_test::main::10([38]) label_test::main::11([39]) label_test::main::12([40]) }
 Originating location:
     match a {
     ^*******^
@@ -657,20 +640,10 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<felt252, felt252>>([41]) -> ([45], [46])
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                  ^****^
-In function: lib.cairo::foo
-drop<felt252>([45]) -> ()
-
-drop<felt252>([46]) -> ()
+drop<Tuple<felt252, felt252>>([37]) -> ()
 
 jump() { label_test::main::14() }
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                  ^****^
-In function: lib.cairo::foo
+
 label_test::main::10:
 
 branch_align() -> ()
@@ -678,18 +651,11 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<felt252, felt252>>([42]) -> ([47], [48])
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                                      ^****^
-In function: lib.cairo::foo
-drop<felt252>([47]) -> ()
-
-drop<felt252>([48]) -> ()
+drop<Tuple<felt252, felt252>>([38]) -> ()
 
 label_test::main::14:
 
-store_temp<RangeCheck>([27]) -> ([49])
+store_temp<RangeCheck>([23]) -> ([41])
 Originating location:
 fn main() {
 ^*********^
@@ -706,19 +672,19 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<u8, u8, u8>>([43]) -> ([50], [51], [52])
+struct_deconstruct<Tuple<u8, u8, u8>>([39]) -> ([42], [43], [44])
 Originating location:
         MyEnum::C((x, _, t)) | MyEnum::D(P { x, y: _, z: t }) => (x + t).into(),
                   ^*******^
 In function: lib.cairo::foo
-drop<u8>([51]) -> ()
+drop<u8>([43]) -> ()
 
-store_temp<u8>([50]) -> ([53])
+store_temp<u8>([42]) -> ([45])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-store_temp<u8>([52]) -> ([54])
+store_temp<u8>([44]) -> ([46])
 Originating location:
     match a {
     ^*******^
@@ -735,26 +701,26 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<test::P>([44]) -> ([55], [56], [57])
+struct_deconstruct<test::P>([40]) -> ([47], [48], [49])
 Originating location:
         MyEnum::C((x, _, t)) | MyEnum::D(P { x, y: _, z: t }) => (x + t).into(),
                                          ^*****************^
 In function: lib.cairo::foo
-drop<u8>([56]) -> ()
+drop<u8>([48]) -> ()
 
-store_temp<u8>([55]) -> ([53])
+store_temp<u8>([47]) -> ([45])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-store_temp<u8>([57]) -> ([54])
+store_temp<u8>([49]) -> ([46])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
 label_test::main::16:
 
-u8_overflowing_add([27], [53], [54]) { fallthrough([58], [59]) label_test::main::17([60], [61]) }
+u8_overflowing_add([23], [45], [46]) { fallthrough([50], [51]) label_test::main::17([52], [53]) }
 Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
@@ -764,21 +730,21 @@ Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
-u8_to_felt252([59]) -> ([62])
+u8_to_felt252([51]) -> ([54])
 Originating location:
         u8_to_felt252(self)
         ^*****************^
 In function: integer.cairo::U8IntoFelt252::into
-drop<felt252>([62]) -> ()
+drop<felt252>([54]) -> ()
 
-store_temp<RangeCheck>([58]) -> ([49])
+store_temp<RangeCheck>([50]) -> ([41])
 Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
 label_test::main::15:
 
-enum_match<test::MyEnum>([13]) { fallthrough([63]) label_test::main::19([64]) label_test::main::20([65]) label_test::main::21([66]) }
+enum_match<test::MyEnum>([13]) { fallthrough([55]) label_test::main::19([56]) label_test::main::20([57]) label_test::main::21([58]) }
 Originating location:
     match a {
     ^*******^
@@ -788,20 +754,10 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<felt252, felt252>>([63]) -> ([67], [68])
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                  ^****^
-In function: lib.cairo::foo
-drop<felt252>([67]) -> ()
-
-drop<felt252>([68]) -> ()
+drop<Tuple<felt252, felt252>>([55]) -> ()
 
 jump() { label_test::main::23() }
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                  ^****^
-In function: lib.cairo::foo
+
 label_test::main::19:
 
 branch_align() -> ()
@@ -809,18 +765,11 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<felt252, felt252>>([64]) -> ([69], [70])
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                                      ^****^
-In function: lib.cairo::foo
-drop<felt252>([69]) -> ()
-
-drop<felt252>([70]) -> ()
+drop<Tuple<felt252, felt252>>([56]) -> ()
 
 label_test::main::23:
 
-store_temp<RangeCheck>([49]) -> ([71])
+store_temp<RangeCheck>([41]) -> ([59])
 Originating location:
 fn main() {
 ^*********^
@@ -837,19 +786,19 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<u8, u8, u8>>([65]) -> ([72], [73], [74])
+struct_deconstruct<Tuple<u8, u8, u8>>([57]) -> ([60], [61], [62])
 Originating location:
         MyEnum::C((x, _, t)) | MyEnum::D(P { x, y: _, z: t }) => (x + t).into(),
                   ^*******^
 In function: lib.cairo::foo
-drop<u8>([73]) -> ()
+drop<u8>([61]) -> ()
 
-store_temp<u8>([72]) -> ([75])
+store_temp<u8>([60]) -> ([63])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-store_temp<u8>([74]) -> ([76])
+store_temp<u8>([62]) -> ([64])
 Originating location:
     match a {
     ^*******^
@@ -866,26 +815,26 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<test::P>([66]) -> ([77], [78], [79])
+struct_deconstruct<test::P>([58]) -> ([65], [66], [67])
 Originating location:
         MyEnum::C((x, _, t)) | MyEnum::D(P { x, y: _, z: t }) => (x + t).into(),
                                          ^*****************^
 In function: lib.cairo::foo
-drop<u8>([78]) -> ()
+drop<u8>([66]) -> ()
 
-store_temp<u8>([77]) -> ([75])
+store_temp<u8>([65]) -> ([63])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-store_temp<u8>([79]) -> ([76])
+store_temp<u8>([67]) -> ([64])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
 label_test::main::25:
 
-u8_overflowing_add([49], [75], [76]) { fallthrough([80], [81]) label_test::main::26([82], [83]) }
+u8_overflowing_add([41], [63], [64]) { fallthrough([68], [69]) label_test::main::26([70], [71]) }
 Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
@@ -895,21 +844,21 @@ Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
-u8_to_felt252([81]) -> ([84])
+u8_to_felt252([69]) -> ([72])
 Originating location:
         u8_to_felt252(self)
         ^*****************^
 In function: integer.cairo::U8IntoFelt252::into
-drop<felt252>([84]) -> ()
+drop<felt252>([72]) -> ()
 
-store_temp<RangeCheck>([80]) -> ([71])
+store_temp<RangeCheck>([68]) -> ([59])
 Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
 label_test::main::24:
 
-enum_match<test::MyEnum>([18]) { fallthrough([85]) label_test::main::28([86]) label_test::main::29([87]) label_test::main::30([88]) }
+enum_match<test::MyEnum>([18]) { fallthrough([73]) label_test::main::28([74]) label_test::main::29([75]) label_test::main::30([76]) }
 Originating location:
     match a {
     ^*******^
@@ -919,20 +868,10 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<felt252, felt252>>([85]) -> ([89], [90])
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                  ^****^
-In function: lib.cairo::foo
-drop<felt252>([89]) -> ()
-
-drop<felt252>([90]) -> ()
+drop<Tuple<felt252, felt252>>([73]) -> ()
 
 jump() { label_test::main::32() }
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                  ^****^
-In function: lib.cairo::foo
+
 label_test::main::28:
 
 branch_align() -> ()
@@ -940,18 +879,11 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<felt252, felt252>>([86]) -> ([91], [92])
-Originating location:
-        MyEnum::A((_, x)) | MyEnum::B((x, _)) => x,
-                                      ^****^
-In function: lib.cairo::foo
-drop<felt252>([91]) -> ()
-
-drop<felt252>([92]) -> ()
+drop<Tuple<felt252, felt252>>([74]) -> ()
 
 label_test::main::32:
 
-store_temp<RangeCheck>([71]) -> ([93])
+store_temp<RangeCheck>([59]) -> ([77])
 Originating location:
 fn main() {
 ^*********^
@@ -968,19 +900,19 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<Tuple<u8, u8, u8>>([87]) -> ([94], [95], [96])
+struct_deconstruct<Tuple<u8, u8, u8>>([75]) -> ([78], [79], [80])
 Originating location:
         MyEnum::C((x, _, t)) | MyEnum::D(P { x, y: _, z: t }) => (x + t).into(),
                   ^*******^
 In function: lib.cairo::foo
-drop<u8>([95]) -> ()
+drop<u8>([79]) -> ()
 
-store_temp<u8>([94]) -> ([97])
+store_temp<u8>([78]) -> ([81])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-store_temp<u8>([96]) -> ([98])
+store_temp<u8>([80]) -> ([82])
 Originating location:
     match a {
     ^*******^
@@ -997,26 +929,26 @@ Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-struct_deconstruct<test::P>([88]) -> ([99], [100], [101])
+struct_deconstruct<test::P>([76]) -> ([83], [84], [85])
 Originating location:
         MyEnum::C((x, _, t)) | MyEnum::D(P { x, y: _, z: t }) => (x + t).into(),
                                          ^*****************^
 In function: lib.cairo::foo
-drop<u8>([100]) -> ()
+drop<u8>([84]) -> ()
 
-store_temp<u8>([99]) -> ([97])
+store_temp<u8>([83]) -> ([81])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
-store_temp<u8>([101]) -> ([98])
+store_temp<u8>([85]) -> ([82])
 Originating location:
     match a {
     ^*******^
 In function: lib.cairo::foo
 label_test::main::34:
 
-u8_overflowing_add([71], [97], [98]) { fallthrough([102], [103]) label_test::main::35([104], [105]) }
+u8_overflowing_add([59], [81], [82]) { fallthrough([86], [87]) label_test::main::35([88], [89]) }
 Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
@@ -1026,35 +958,35 @@ Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
-u8_to_felt252([103]) -> ([106])
+u8_to_felt252([87]) -> ([90])
 Originating location:
         u8_to_felt252(self)
         ^*****************^
 In function: integer.cairo::U8IntoFelt252::into
-drop<felt252>([106]) -> ()
+drop<felt252>([90]) -> ()
 
-store_temp<RangeCheck>([102]) -> ([93])
+store_temp<RangeCheck>([86]) -> ([77])
 Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
 label_test::main::33:
 
-struct_construct<Unit>() -> ([107])
+struct_construct<Unit>() -> ([91])
 
-struct_construct<Tuple<Unit>>([107]) -> ([108])
+struct_construct<Tuple<Unit>>([91]) -> ([92])
 
-enum_init<core::panics::PanicResult::<((),)>, 0>([108]) -> ([109])
+enum_init<core::panics::PanicResult::<((),)>, 0>([92]) -> ([93])
 Originating location:
 fn main() {
           ^
 In function: lib.cairo::main
-store_temp<core::panics::PanicResult::<((),)>>([109]) -> ([109])
+store_temp<core::panics::PanicResult::<((),)>>([93]) -> ([93])
 Originating location:
 fn main() {
           ^
 In function: lib.cairo::main
-return([93], [109])
+return([77], [93])
 Originating location:
 fn main() {
           ^
@@ -1066,45 +998,45 @@ Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
-drop<u8>([105]) -> ()
+drop<u8>([89]) -> ()
 
-array_new<felt252>() -> ([110])
+array_new<felt252>() -> ([94])
 Originating location:
         array_new()
         ^*********^
 In function: array.cairo::ArrayImpl::new
-const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([111])
+const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([95])
 
-store_temp<felt252>([111]) -> ([111])
+store_temp<felt252>([95]) -> ([95])
 Originating location:
         array_append(ref self, value)
         ^***************************^
 In function: array.cairo::ArrayImpl::append
-array_append<felt252>([110], [111]) -> ([112])
+array_append<felt252>([94], [95]) -> ([96])
 Originating location:
         array_append(ref self, value)
         ^***************************^
 In function: array.cairo::ArrayImpl::append
-struct_construct<core::panics::Panic>() -> ([113])
+struct_construct<core::panics::Panic>() -> ([97])
 
-struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([113], [112]) -> ([114])
+struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([97], [96]) -> ([98])
 
-enum_init<core::panics::PanicResult::<((),)>, 1>([114]) -> ([115])
+enum_init<core::panics::PanicResult::<((),)>, 1>([98]) -> ([99])
 Originating location:
     let _ = foo(d);
             ^****^
 In function: lib.cairo::main
-store_temp<RangeCheck>([104]) -> ([104])
+store_temp<RangeCheck>([88]) -> ([88])
 Originating location:
     let _ = foo(d);
             ^****^
 In function: lib.cairo::main
-store_temp<core::panics::PanicResult::<((),)>>([115]) -> ([115])
+store_temp<core::panics::PanicResult::<((),)>>([99]) -> ([99])
 Originating location:
     let _ = foo(d);
             ^****^
 In function: lib.cairo::main
-return([104], [115])
+return([88], [99])
 Originating location:
     let _ = foo(d);
             ^****^
@@ -1120,47 +1052,47 @@ Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
-drop<u8>([83]) -> ()
+drop<u8>([71]) -> ()
 
 drop<test::MyEnum>([18]) -> ()
 
-array_new<felt252>() -> ([116])
+array_new<felt252>() -> ([100])
 Originating location:
         array_new()
         ^*********^
 In function: array.cairo::ArrayImpl::new
-const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([117])
+const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([101])
 
-store_temp<felt252>([117]) -> ([117])
+store_temp<felt252>([101]) -> ([101])
 Originating location:
         array_append(ref self, value)
         ^***************************^
 In function: array.cairo::ArrayImpl::append
-array_append<felt252>([116], [117]) -> ([118])
+array_append<felt252>([100], [101]) -> ([102])
 Originating location:
         array_append(ref self, value)
         ^***************************^
 In function: array.cairo::ArrayImpl::append
-struct_construct<core::panics::Panic>() -> ([119])
+struct_construct<core::panics::Panic>() -> ([103])
 
-struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([119], [118]) -> ([120])
+struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([103], [102]) -> ([104])
 
-enum_init<core::panics::PanicResult::<((),)>, 1>([120]) -> ([121])
+enum_init<core::panics::PanicResult::<((),)>, 1>([104]) -> ([105])
 Originating location:
     let _ = foo(c);
             ^****^
 In function: lib.cairo::main
-store_temp<RangeCheck>([82]) -> ([82])
+store_temp<RangeCheck>([70]) -> ([70])
 Originating location:
     let _ = foo(c);
             ^****^
 In function: lib.cairo::main
-store_temp<core::panics::PanicResult::<((),)>>([121]) -> ([121])
+store_temp<core::panics::PanicResult::<((),)>>([105]) -> ([105])
 Originating location:
     let _ = foo(c);
             ^****^
 In function: lib.cairo::main
-return([82], [121])
+return([70], [105])
 Originating location:
     let _ = foo(c);
             ^****^
@@ -1176,49 +1108,49 @@ Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
-drop<u8>([61]) -> ()
+drop<u8>([53]) -> ()
 
 drop<test::MyEnum>([18]) -> ()
 
 drop<test::MyEnum>([13]) -> ()
 
-array_new<felt252>() -> ([122])
+array_new<felt252>() -> ([106])
 Originating location:
         array_new()
         ^*********^
 In function: array.cairo::ArrayImpl::new
-const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([123])
+const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([107])
 
-store_temp<felt252>([123]) -> ([123])
+store_temp<felt252>([107]) -> ([107])
 Originating location:
         array_append(ref self, value)
         ^***************************^
 In function: array.cairo::ArrayImpl::append
-array_append<felt252>([122], [123]) -> ([124])
+array_append<felt252>([106], [107]) -> ([108])
 Originating location:
         array_append(ref self, value)
         ^***************************^
 In function: array.cairo::ArrayImpl::append
-struct_construct<core::panics::Panic>() -> ([125])
+struct_construct<core::panics::Panic>() -> ([109])
 
-struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([125], [124]) -> ([126])
+struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([109], [108]) -> ([110])
 
-enum_init<core::panics::PanicResult::<((),)>, 1>([126]) -> ([127])
+enum_init<core::panics::PanicResult::<((),)>, 1>([110]) -> ([111])
 Originating location:
     let _ = foo(b);
             ^****^
 In function: lib.cairo::main
-store_temp<RangeCheck>([60]) -> ([60])
+store_temp<RangeCheck>([52]) -> ([52])
 Originating location:
     let _ = foo(b);
             ^****^
 In function: lib.cairo::main
-store_temp<core::panics::PanicResult::<((),)>>([127]) -> ([127])
+store_temp<core::panics::PanicResult::<((),)>>([111]) -> ([111])
 Originating location:
     let _ = foo(b);
             ^****^
 In function: lib.cairo::main
-return([60], [127])
+return([52], [111])
 Originating location:
     let _ = foo(b);
             ^****^
@@ -1234,7 +1166,7 @@ Originating location:
         u8_overflowing_add(lhs, rhs).expect('u8_add Overflow')
         ^**************************^
 In function: integer.cairo::U8Add::add
-drop<u8>([39]) -> ()
+drop<u8>([35]) -> ()
 
 drop<test::MyEnum>([18]) -> ()
 
@@ -1242,43 +1174,43 @@ drop<test::MyEnum>([13]) -> ()
 
 drop<test::MyEnum>([8]) -> ()
 
-array_new<felt252>() -> ([128])
+array_new<felt252>() -> ([112])
 Originating location:
         array_new()
         ^*********^
 In function: array.cairo::ArrayImpl::new
-const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([129])
+const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([113])
 
-store_temp<felt252>([129]) -> ([129])
+store_temp<felt252>([113]) -> ([113])
 Originating location:
         array_append(ref self, value)
         ^***************************^
 In function: array.cairo::ArrayImpl::append
-array_append<felt252>([128], [129]) -> ([130])
+array_append<felt252>([112], [113]) -> ([114])
 Originating location:
         array_append(ref self, value)
         ^***************************^
 In function: array.cairo::ArrayImpl::append
-struct_construct<core::panics::Panic>() -> ([131])
+struct_construct<core::panics::Panic>() -> ([115])
 
-struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([131], [130]) -> ([132])
+struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([115], [114]) -> ([116])
 
-enum_init<core::panics::PanicResult::<((),)>, 1>([132]) -> ([133])
+enum_init<core::panics::PanicResult::<((),)>, 1>([116]) -> ([117])
 Originating location:
     let _ = foo(a);
             ^****^
 In function: lib.cairo::main
-store_temp<RangeCheck>([38]) -> ([38])
+store_temp<RangeCheck>([34]) -> ([34])
 Originating location:
     let _ = foo(a);
             ^****^
 In function: lib.cairo::main
-store_temp<core::panics::PanicResult::<((),)>>([133]) -> ([133])
+store_temp<core::panics::PanicResult::<((),)>>([117]) -> ([117])
 Originating location:
     let _ = foo(a);
             ^****^
 In function: lib.cairo::main
-return([38], [133])
+return([34], [117])
 Originating location:
     let _ = foo(a);
             ^****^
diff --git a/tests/test_data/match_or.sierra b/tests/test_data/match_or.sierra
index 299d5f62d5d..8dca5fe05ae 100644
--- a/tests/test_data/match_or.sierra
+++ b/tests/test_data/match_or.sierra
@@ -37,8 +37,7 @@ libfunc enum_init<examples::match_or::MyEnum, 3> = enum_init<examples::match_or:
 libfunc store_temp<examples::match_or::MyEnum> = store_temp<examples::match_or::MyEnum>;
 libfunc enum_match<examples::match_or::MyEnum> = enum_match<examples::match_or::MyEnum>;
 libfunc branch_align = branch_align;
-libfunc struct_deconstruct<Tuple<felt252, felt252>> = struct_deconstruct<Tuple<felt252, felt252>>;
-libfunc drop<felt252> = drop<felt252>;
+libfunc drop<Tuple<felt252, felt252>> = drop<Tuple<felt252, felt252>>;
 libfunc jump = jump;
 libfunc store_temp<RangeCheck> = store_temp<RangeCheck>;
 libfunc struct_deconstruct<Tuple<u8, u8, u8>> = struct_deconstruct<Tuple<u8, u8, u8>>;
@@ -47,6 +46,7 @@ libfunc store_temp<u8> = store_temp<u8>;
 libfunc struct_deconstruct<examples::match_or::P> = struct_deconstruct<examples::match_or::P>;
 libfunc u8_overflowing_add = u8_overflowing_add;
 libfunc u8_to_felt252 = u8_to_felt252;
+libfunc drop<felt252> = drop<felt252>;
 libfunc struct_construct<Unit> = struct_construct<Unit>;
 libfunc struct_construct<Tuple<Unit>> = struct_construct<Tuple<Unit>>;
 libfunc enum_init<core::panics::PanicResult::<((),)>, 0> = enum_init<core::panics::PanicResult::<((),)>, 0>;
@@ -59,6 +59,7 @@ libfunc struct_construct<core::panics::Panic> = struct_construct<core::panics::P
 libfunc struct_construct<Tuple<core::panics::Panic, Array<felt252>>> = struct_construct<Tuple<core::panics::Panic, Array<felt252>>>;
 libfunc enum_init<core::panics::PanicResult::<((),)>, 1> = enum_init<core::panics::PanicResult::<((),)>, 1>;
 libfunc drop<examples::match_or::MyEnum> = drop<examples::match_or::MyEnum>;
+libfunc struct_deconstruct<Tuple<felt252, felt252>> = struct_deconstruct<Tuple<felt252, felt252>>;
 libfunc struct_construct<Tuple<felt252>> = struct_construct<Tuple<felt252>>;
 libfunc enum_init<core::panics::PanicResult::<(core::felt252,)>, 0> = enum_init<core::panics::PanicResult::<(core::felt252,)>, 0>;
 libfunc store_temp<core::panics::PanicResult::<(core::felt252,)>> = store_temp<core::panics::PanicResult::<(core::felt252,)>>;
@@ -86,223 +87,207 @@ store_temp<examples::match_or::MyEnum>([4]) -> ([4]); // 18
 store_temp<examples::match_or::MyEnum>([8]) -> ([8]); // 19
 store_temp<examples::match_or::MyEnum>([13]) -> ([13]); // 20
 store_temp<examples::match_or::MyEnum>([18]) -> ([18]); // 21
-enum_match<examples::match_or::MyEnum>([4]) { fallthrough([19]) 28([20]) 34([21]) 40([22]) }; // 22
+enum_match<examples::match_or::MyEnum>([4]) { fallthrough([19]) 26([20]) 30([21]) 36([22]) }; // 22
 branch_align() -> (); // 23
-struct_deconstruct<Tuple<felt252, felt252>>([19]) -> ([23], [24]); // 24
-drop<felt252>([23]) -> (); // 25
-drop<felt252>([24]) -> (); // 26
-jump() { 32() }; // 27
-branch_align() -> (); // 28
-struct_deconstruct<Tuple<felt252, felt252>>([20]) -> ([25], [26]); // 29
-drop<felt252>([25]) -> (); // 30
-drop<felt252>([26]) -> (); // 31
-store_temp<RangeCheck>([0]) -> ([27]); // 32
-jump() { 50() }; // 33
-branch_align() -> (); // 34
-struct_deconstruct<Tuple<u8, u8, u8>>([21]) -> ([28], [29], [30]); // 35
-drop<u8>([29]) -> (); // 36
-store_temp<u8>([28]) -> ([31]); // 37
-store_temp<u8>([30]) -> ([32]); // 38
-jump() { 45() }; // 39
-branch_align() -> (); // 40
-struct_deconstruct<examples::match_or::P>([22]) -> ([33], [34], [35]); // 41
-drop<u8>([34]) -> (); // 42
-store_temp<u8>([33]) -> ([31]); // 43
-store_temp<u8>([35]) -> ([32]); // 44
-u8_overflowing_add([0], [31], [32]) { fallthrough([36], [37]) 178([38], [39]) }; // 45
-branch_align() -> (); // 46
-u8_to_felt252([37]) -> ([40]); // 47
-drop<felt252>([40]) -> (); // 48
-store_temp<RangeCheck>([36]) -> ([27]); // 49
-enum_match<examples::match_or::MyEnum>([8]) { fallthrough([41]) 56([42]) 62([43]) 68([44]) }; // 50
-branch_align() -> (); // 51
-struct_deconstruct<Tuple<felt252, felt252>>([41]) -> ([45], [46]); // 52
-drop<felt252>([45]) -> (); // 53
-drop<felt252>([46]) -> (); // 54
-jump() { 60() }; // 55
-branch_align() -> (); // 56
-struct_deconstruct<Tuple<felt252, felt252>>([42]) -> ([47], [48]); // 57
-drop<felt252>([47]) -> (); // 58
-drop<felt252>([48]) -> (); // 59
-store_temp<RangeCheck>([27]) -> ([49]); // 60
-jump() { 78() }; // 61
-branch_align() -> (); // 62
-struct_deconstruct<Tuple<u8, u8, u8>>([43]) -> ([50], [51], [52]); // 63
-drop<u8>([51]) -> (); // 64
-store_temp<u8>([50]) -> ([53]); // 65
-store_temp<u8>([52]) -> ([54]); // 66
-jump() { 73() }; // 67
-branch_align() -> (); // 68
-struct_deconstruct<examples::match_or::P>([44]) -> ([55], [56], [57]); // 69
-drop<u8>([56]) -> (); // 70
-store_temp<u8>([55]) -> ([53]); // 71
-store_temp<u8>([57]) -> ([54]); // 72
-u8_overflowing_add([27], [53], [54]) { fallthrough([58], [59]) 164([60], [61]) }; // 73
+drop<Tuple<felt252, felt252>>([19]) -> (); // 24
+jump() { 28() }; // 25
+branch_align() -> (); // 26
+drop<Tuple<felt252, felt252>>([20]) -> (); // 27
+store_temp<RangeCheck>([0]) -> ([23]); // 28
+jump() { 46() }; // 29
+branch_align() -> (); // 30
+struct_deconstruct<Tuple<u8, u8, u8>>([21]) -> ([24], [25], [26]); // 31
+drop<u8>([25]) -> (); // 32
+store_temp<u8>([24]) -> ([27]); // 33
+store_temp<u8>([26]) -> ([28]); // 34
+jump() { 41() }; // 35
+branch_align() -> (); // 36
+struct_deconstruct<examples::match_or::P>([22]) -> ([29], [30], [31]); // 37
+drop<u8>([30]) -> (); // 38
+store_temp<u8>([29]) -> ([27]); // 39
+store_temp<u8>([31]) -> ([28]); // 40
+u8_overflowing_add([0], [27], [28]) { fallthrough([32], [33]) 162([34], [35]) }; // 41
+branch_align() -> (); // 42
+u8_to_felt252([33]) -> ([36]); // 43
+drop<felt252>([36]) -> (); // 44
+store_temp<RangeCheck>([32]) -> ([23]); // 45
+enum_match<examples::match_or::MyEnum>([8]) { fallthrough([37]) 50([38]) 54([39]) 60([40]) }; // 46
+branch_align() -> (); // 47
+drop<Tuple<felt252, felt252>>([37]) -> (); // 48
+jump() { 52() }; // 49
+branch_align() -> (); // 50
+drop<Tuple<felt252, felt252>>([38]) -> (); // 51
+store_temp<RangeCheck>([23]) -> ([41]); // 52
+jump() { 70() }; // 53
+branch_align() -> (); // 54
+struct_deconstruct<Tuple<u8, u8, u8>>([39]) -> ([42], [43], [44]); // 55
+drop<u8>([43]) -> (); // 56
+store_temp<u8>([42]) -> ([45]); // 57
+store_temp<u8>([44]) -> ([46]); // 58
+jump() { 65() }; // 59
+branch_align() -> (); // 60
+struct_deconstruct<examples::match_or::P>([40]) -> ([47], [48], [49]); // 61
+drop<u8>([48]) -> (); // 62
+store_temp<u8>([47]) -> ([45]); // 63
+store_temp<u8>([49]) -> ([46]); // 64
+u8_overflowing_add([23], [45], [46]) { fallthrough([50], [51]) 148([52], [53]) }; // 65
+branch_align() -> (); // 66
+u8_to_felt252([51]) -> ([54]); // 67
+drop<felt252>([54]) -> (); // 68
+store_temp<RangeCheck>([50]) -> ([41]); // 69
+enum_match<examples::match_or::MyEnum>([13]) { fallthrough([55]) 74([56]) 78([57]) 84([58]) }; // 70
+branch_align() -> (); // 71
+drop<Tuple<felt252, felt252>>([55]) -> (); // 72
+jump() { 76() }; // 73
 branch_align() -> (); // 74
-u8_to_felt252([59]) -> ([62]); // 75
-drop<felt252>([62]) -> (); // 76
-store_temp<RangeCheck>([58]) -> ([49]); // 77
-enum_match<examples::match_or::MyEnum>([13]) { fallthrough([63]) 84([64]) 90([65]) 96([66]) }; // 78
-branch_align() -> (); // 79
-struct_deconstruct<Tuple<felt252, felt252>>([63]) -> ([67], [68]); // 80
-drop<felt252>([67]) -> (); // 81
-drop<felt252>([68]) -> (); // 82
-jump() { 88() }; // 83
+drop<Tuple<felt252, felt252>>([56]) -> (); // 75
+store_temp<RangeCheck>([41]) -> ([59]); // 76
+jump() { 94() }; // 77
+branch_align() -> (); // 78
+struct_deconstruct<Tuple<u8, u8, u8>>([57]) -> ([60], [61], [62]); // 79
+drop<u8>([61]) -> (); // 80
+store_temp<u8>([60]) -> ([63]); // 81
+store_temp<u8>([62]) -> ([64]); // 82
+jump() { 89() }; // 83
 branch_align() -> (); // 84
-struct_deconstruct<Tuple<felt252, felt252>>([64]) -> ([69], [70]); // 85
-drop<felt252>([69]) -> (); // 86
-drop<felt252>([70]) -> (); // 87
-store_temp<RangeCheck>([49]) -> ([71]); // 88
-jump() { 106() }; // 89
+struct_deconstruct<examples::match_or::P>([58]) -> ([65], [66], [67]); // 85
+drop<u8>([66]) -> (); // 86
+store_temp<u8>([65]) -> ([63]); // 87
+store_temp<u8>([67]) -> ([64]); // 88
+u8_overflowing_add([41], [63], [64]) { fallthrough([68], [69]) 135([70], [71]) }; // 89
 branch_align() -> (); // 90
-struct_deconstruct<Tuple<u8, u8, u8>>([65]) -> ([72], [73], [74]); // 91
-drop<u8>([73]) -> (); // 92
-store_temp<u8>([72]) -> ([75]); // 93
-store_temp<u8>([74]) -> ([76]); // 94
-jump() { 101() }; // 95
-branch_align() -> (); // 96
-struct_deconstruct<examples::match_or::P>([66]) -> ([77], [78], [79]); // 97
-drop<u8>([78]) -> (); // 98
-store_temp<u8>([77]) -> ([75]); // 99
-store_temp<u8>([79]) -> ([76]); // 100
-u8_overflowing_add([49], [75], [76]) { fallthrough([80], [81]) 151([82], [83]) }; // 101
+u8_to_felt252([69]) -> ([72]); // 91
+drop<felt252>([72]) -> (); // 92
+store_temp<RangeCheck>([68]) -> ([59]); // 93
+enum_match<examples::match_or::MyEnum>([18]) { fallthrough([73]) 98([74]) 102([75]) 108([76]) }; // 94
+branch_align() -> (); // 95
+drop<Tuple<felt252, felt252>>([73]) -> (); // 96
+jump() { 100() }; // 97
+branch_align() -> (); // 98
+drop<Tuple<felt252, felt252>>([74]) -> (); // 99
+store_temp<RangeCheck>([59]) -> ([77]); // 100
+jump() { 118() }; // 101
 branch_align() -> (); // 102
-u8_to_felt252([81]) -> ([84]); // 103
-drop<felt252>([84]) -> (); // 104
-store_temp<RangeCheck>([80]) -> ([71]); // 105
-enum_match<examples::match_or::MyEnum>([18]) { fallthrough([85]) 112([86]) 118([87]) 124([88]) }; // 106
-branch_align() -> (); // 107
-struct_deconstruct<Tuple<felt252, felt252>>([85]) -> ([89], [90]); // 108
-drop<felt252>([89]) -> (); // 109
-drop<felt252>([90]) -> (); // 110
-jump() { 116() }; // 111
-branch_align() -> (); // 112
-struct_deconstruct<Tuple<felt252, felt252>>([86]) -> ([91], [92]); // 113
-drop<felt252>([91]) -> (); // 114
-drop<felt252>([92]) -> (); // 115
-store_temp<RangeCheck>([71]) -> ([93]); // 116
-jump() { 134() }; // 117
-branch_align() -> (); // 118
-struct_deconstruct<Tuple<u8, u8, u8>>([87]) -> ([94], [95], [96]); // 119
-drop<u8>([95]) -> (); // 120
-store_temp<u8>([94]) -> ([97]); // 121
-store_temp<u8>([96]) -> ([98]); // 122
-jump() { 129() }; // 123
-branch_align() -> (); // 124
-struct_deconstruct<examples::match_or::P>([88]) -> ([99], [100], [101]); // 125
-drop<u8>([100]) -> (); // 126
-store_temp<u8>([99]) -> ([97]); // 127
-store_temp<u8>([101]) -> ([98]); // 128
-u8_overflowing_add([71], [97], [98]) { fallthrough([102], [103]) 139([104], [105]) }; // 129
-branch_align() -> (); // 130
-u8_to_felt252([103]) -> ([106]); // 131
-drop<felt252>([106]) -> (); // 132
-store_temp<RangeCheck>([102]) -> ([93]); // 133
-struct_construct<Unit>() -> ([107]); // 134
-struct_construct<Tuple<Unit>>([107]) -> ([108]); // 135
-enum_init<core::panics::PanicResult::<((),)>, 0>([108]) -> ([109]); // 136
-store_temp<core::panics::PanicResult::<((),)>>([109]) -> ([109]); // 137
-return([93], [109]); // 138
-branch_align() -> (); // 139
-drop<u8>([105]) -> (); // 140
-array_new<felt252>() -> ([110]); // 141
-const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([111]); // 142
-store_temp<felt252>([111]) -> ([111]); // 143
-array_append<felt252>([110], [111]) -> ([112]); // 144
-struct_construct<core::panics::Panic>() -> ([113]); // 145
-struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([113], [112]) -> ([114]); // 146
-enum_init<core::panics::PanicResult::<((),)>, 1>([114]) -> ([115]); // 147
-store_temp<RangeCheck>([104]) -> ([104]); // 148
-store_temp<core::panics::PanicResult::<((),)>>([115]) -> ([115]); // 149
-return([104], [115]); // 150
-branch_align() -> (); // 151
-drop<u8>([83]) -> (); // 152
-drop<examples::match_or::MyEnum>([18]) -> (); // 153
-array_new<felt252>() -> ([116]); // 154
-const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([117]); // 155
-store_temp<felt252>([117]) -> ([117]); // 156
-array_append<felt252>([116], [117]) -> ([118]); // 157
-struct_construct<core::panics::Panic>() -> ([119]); // 158
-struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([119], [118]) -> ([120]); // 159
-enum_init<core::panics::PanicResult::<((),)>, 1>([120]) -> ([121]); // 160
-store_temp<RangeCheck>([82]) -> ([82]); // 161
-store_temp<core::panics::PanicResult::<((),)>>([121]) -> ([121]); // 162
-return([82], [121]); // 163
-branch_align() -> (); // 164
-drop<u8>([61]) -> (); // 165
-drop<examples::match_or::MyEnum>([18]) -> (); // 166
-drop<examples::match_or::MyEnum>([13]) -> (); // 167
-array_new<felt252>() -> ([122]); // 168
-const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([123]); // 169
-store_temp<felt252>([123]) -> ([123]); // 170
-array_append<felt252>([122], [123]) -> ([124]); // 171
-struct_construct<core::panics::Panic>() -> ([125]); // 172
-struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([125], [124]) -> ([126]); // 173
-enum_init<core::panics::PanicResult::<((),)>, 1>([126]) -> ([127]); // 174
-store_temp<RangeCheck>([60]) -> ([60]); // 175
-store_temp<core::panics::PanicResult::<((),)>>([127]) -> ([127]); // 176
-return([60], [127]); // 177
+struct_deconstruct<Tuple<u8, u8, u8>>([75]) -> ([78], [79], [80]); // 103
+drop<u8>([79]) -> (); // 104
+store_temp<u8>([78]) -> ([81]); // 105
+store_temp<u8>([80]) -> ([82]); // 106
+jump() { 113() }; // 107
+branch_align() -> (); // 108
+struct_deconstruct<examples::match_or::P>([76]) -> ([83], [84], [85]); // 109
+drop<u8>([84]) -> (); // 110
+store_temp<u8>([83]) -> ([81]); // 111
+store_temp<u8>([85]) -> ([82]); // 112
+u8_overflowing_add([59], [81], [82]) { fallthrough([86], [87]) 123([88], [89]) }; // 113
+branch_align() -> (); // 114
+u8_to_felt252([87]) -> ([90]); // 115
+drop<felt252>([90]) -> (); // 116
+store_temp<RangeCheck>([86]) -> ([77]); // 117
+struct_construct<Unit>() -> ([91]); // 118
+struct_construct<Tuple<Unit>>([91]) -> ([92]); // 119
+enum_init<core::panics::PanicResult::<((),)>, 0>([92]) -> ([93]); // 120
+store_temp<core::panics::PanicResult::<((),)>>([93]) -> ([93]); // 121
+return([77], [93]); // 122
+branch_align() -> (); // 123
+drop<u8>([89]) -> (); // 124
+array_new<felt252>() -> ([94]); // 125
+const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([95]); // 126
+store_temp<felt252>([95]) -> ([95]); // 127
+array_append<felt252>([94], [95]) -> ([96]); // 128
+struct_construct<core::panics::Panic>() -> ([97]); // 129
+struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([97], [96]) -> ([98]); // 130
+enum_init<core::panics::PanicResult::<((),)>, 1>([98]) -> ([99]); // 131
+store_temp<RangeCheck>([88]) -> ([88]); // 132
+store_temp<core::panics::PanicResult::<((),)>>([99]) -> ([99]); // 133
+return([88], [99]); // 134
+branch_align() -> (); // 135
+drop<u8>([71]) -> (); // 136
+drop<examples::match_or::MyEnum>([18]) -> (); // 137
+array_new<felt252>() -> ([100]); // 138
+const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([101]); // 139
+store_temp<felt252>([101]) -> ([101]); // 140
+array_append<felt252>([100], [101]) -> ([102]); // 141
+struct_construct<core::panics::Panic>() -> ([103]); // 142
+struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([103], [102]) -> ([104]); // 143
+enum_init<core::panics::PanicResult::<((),)>, 1>([104]) -> ([105]); // 144
+store_temp<RangeCheck>([70]) -> ([70]); // 145
+store_temp<core::panics::PanicResult::<((),)>>([105]) -> ([105]); // 146
+return([70], [105]); // 147
+branch_align() -> (); // 148
+drop<u8>([53]) -> (); // 149
+drop<examples::match_or::MyEnum>([18]) -> (); // 150
+drop<examples::match_or::MyEnum>([13]) -> (); // 151
+array_new<felt252>() -> ([106]); // 152
+const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([107]); // 153
+store_temp<felt252>([107]) -> ([107]); // 154
+array_append<felt252>([106], [107]) -> ([108]); // 155
+struct_construct<core::panics::Panic>() -> ([109]); // 156
+struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([109], [108]) -> ([110]); // 157
+enum_init<core::panics::PanicResult::<((),)>, 1>([110]) -> ([111]); // 158
+store_temp<RangeCheck>([52]) -> ([52]); // 159
+store_temp<core::panics::PanicResult::<((),)>>([111]) -> ([111]); // 160
+return([52], [111]); // 161
+branch_align() -> (); // 162
+drop<u8>([35]) -> (); // 163
+drop<examples::match_or::MyEnum>([18]) -> (); // 164
+drop<examples::match_or::MyEnum>([13]) -> (); // 165
+drop<examples::match_or::MyEnum>([8]) -> (); // 166
+array_new<felt252>() -> ([112]); // 167
+const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([113]); // 168
+store_temp<felt252>([113]) -> ([113]); // 169
+array_append<felt252>([112], [113]) -> ([114]); // 170
+struct_construct<core::panics::Panic>() -> ([115]); // 171
+struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([115], [114]) -> ([116]); // 172
+enum_init<core::panics::PanicResult::<((),)>, 1>([116]) -> ([117]); // 173
+store_temp<RangeCheck>([34]) -> ([34]); // 174
+store_temp<core::panics::PanicResult::<((),)>>([117]) -> ([117]); // 175
+return([34], [117]); // 176
+enum_match<examples::match_or::MyEnum>([1]) { fallthrough([2]) 183([3]) 190([4]) 196([5]) }; // 177
 branch_align() -> (); // 178
-drop<u8>([39]) -> (); // 179
-drop<examples::match_or::MyEnum>([18]) -> (); // 180
-drop<examples::match_or::MyEnum>([13]) -> (); // 181
-drop<examples::match_or::MyEnum>([8]) -> (); // 182
-array_new<felt252>() -> ([128]); // 183
-const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([129]); // 184
-store_temp<felt252>([129]) -> ([129]); // 185
-array_append<felt252>([128], [129]) -> ([130]); // 186
-struct_construct<core::panics::Panic>() -> ([131]); // 187
-struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([131], [130]) -> ([132]); // 188
-enum_init<core::panics::PanicResult::<((),)>, 1>([132]) -> ([133]); // 189
-store_temp<RangeCheck>([38]) -> ([38]); // 190
-store_temp<core::panics::PanicResult::<((),)>>([133]) -> ([133]); // 191
-return([38], [133]); // 192
-enum_match<examples::match_or::MyEnum>([1]) { fallthrough([2]) 199([3]) 206([4]) 212([5]) }; // 193
-branch_align() -> (); // 194
-struct_deconstruct<Tuple<felt252, felt252>>([2]) -> ([6], [7]); // 195
-drop<felt252>([6]) -> (); // 196
-store_temp<felt252>([7]) -> ([8]); // 197
-jump() { 203() }; // 198
-branch_align() -> (); // 199
-struct_deconstruct<Tuple<felt252, felt252>>([3]) -> ([9], [10]); // 200
-drop<felt252>([10]) -> (); // 201
-store_temp<felt252>([9]) -> ([8]); // 202
-store_temp<RangeCheck>([0]) -> ([11]); // 203
-store_temp<felt252>([8]) -> ([12]); // 204
-jump() { 222() }; // 205
-branch_align() -> (); // 206
-struct_deconstruct<Tuple<u8, u8, u8>>([4]) -> ([13], [14], [15]); // 207
-drop<u8>([14]) -> (); // 208
-store_temp<u8>([13]) -> ([16]); // 209
-store_temp<u8>([15]) -> ([17]); // 210
-jump() { 217() }; // 211
-branch_align() -> (); // 212
-struct_deconstruct<examples::match_or::P>([5]) -> ([18], [19], [20]); // 213
-drop<u8>([19]) -> (); // 214
-store_temp<u8>([18]) -> ([16]); // 215
-store_temp<u8>([20]) -> ([17]); // 216
-u8_overflowing_add([0], [16], [17]) { fallthrough([21], [22]) 227([23], [24]) }; // 217
-branch_align() -> (); // 218
-u8_to_felt252([22]) -> ([25]); // 219
-store_temp<RangeCheck>([21]) -> ([11]); // 220
-store_temp<felt252>([25]) -> ([12]); // 221
-struct_construct<Tuple<felt252>>([12]) -> ([26]); // 222
-enum_init<core::panics::PanicResult::<(core::felt252,)>, 0>([26]) -> ([27]); // 223
-store_temp<RangeCheck>([11]) -> ([11]); // 224
-store_temp<core::panics::PanicResult::<(core::felt252,)>>([27]) -> ([27]); // 225
-return([11], [27]); // 226
-branch_align() -> (); // 227
-drop<u8>([24]) -> (); // 228
-array_new<felt252>() -> ([28]); // 229
-const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([29]); // 230
-store_temp<felt252>([29]) -> ([29]); // 231
-array_append<felt252>([28], [29]) -> ([30]); // 232
-struct_construct<core::panics::Panic>() -> ([31]); // 233
-struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([31], [30]) -> ([32]); // 234
-enum_init<core::panics::PanicResult::<(core::felt252,)>, 1>([32]) -> ([33]); // 235
-store_temp<RangeCheck>([23]) -> ([23]); // 236
-store_temp<core::panics::PanicResult::<(core::felt252,)>>([33]) -> ([33]); // 237
-return([23], [33]); // 238
+struct_deconstruct<Tuple<felt252, felt252>>([2]) -> ([6], [7]); // 179
+drop<felt252>([6]) -> (); // 180
+store_temp<felt252>([7]) -> ([8]); // 181
+jump() { 187() }; // 182
+branch_align() -> (); // 183
+struct_deconstruct<Tuple<felt252, felt252>>([3]) -> ([9], [10]); // 184
+drop<felt252>([10]) -> (); // 185
+store_temp<felt252>([9]) -> ([8]); // 186
+store_temp<RangeCheck>([0]) -> ([11]); // 187
+store_temp<felt252>([8]) -> ([12]); // 188
+jump() { 206() }; // 189
+branch_align() -> (); // 190
+struct_deconstruct<Tuple<u8, u8, u8>>([4]) -> ([13], [14], [15]); // 191
+drop<u8>([14]) -> (); // 192
+store_temp<u8>([13]) -> ([16]); // 193
+store_temp<u8>([15]) -> ([17]); // 194
+jump() { 201() }; // 195
+branch_align() -> (); // 196
+struct_deconstruct<examples::match_or::P>([5]) -> ([18], [19], [20]); // 197
+drop<u8>([19]) -> (); // 198
+store_temp<u8>([18]) -> ([16]); // 199
+store_temp<u8>([20]) -> ([17]); // 200
+u8_overflowing_add([0], [16], [17]) { fallthrough([21], [22]) 211([23], [24]) }; // 201
+branch_align() -> (); // 202
+u8_to_felt252([22]) -> ([25]); // 203
+store_temp<RangeCheck>([21]) -> ([11]); // 204
+store_temp<felt252>([25]) -> ([12]); // 205
+struct_construct<Tuple<felt252>>([12]) -> ([26]); // 206
+enum_init<core::panics::PanicResult::<(core::felt252,)>, 0>([26]) -> ([27]); // 207
+store_temp<RangeCheck>([11]) -> ([11]); // 208
+store_temp<core::panics::PanicResult::<(core::felt252,)>>([27]) -> ([27]); // 209
+return([11], [27]); // 210
+branch_align() -> (); // 211
+drop<u8>([24]) -> (); // 212
+array_new<felt252>() -> ([28]); // 213
+const_as_immediate<Const<felt252, 608642104203229548495787928534675319>>() -> ([29]); // 214
+store_temp<felt252>([29]) -> ([29]); // 215
+array_append<felt252>([28], [29]) -> ([30]); // 216
+struct_construct<core::panics::Panic>() -> ([31]); // 217
+struct_construct<Tuple<core::panics::Panic, Array<felt252>>>([31], [30]) -> ([32]); // 218
+enum_init<core::panics::PanicResult::<(core::felt252,)>, 1>([32]) -> ([33]); // 219
+store_temp<RangeCheck>([23]) -> ([23]); // 220
+store_temp<core::panics::PanicResult::<(core::felt252,)>>([33]) -> ([33]); // 221
+return([23], [33]); // 222
 
 examples::match_or::main@0([0]: RangeCheck) -> (RangeCheck, core::panics::PanicResult::<((),)>);
-examples::match_or::foo@193([0]: RangeCheck, [1]: examples::match_or::MyEnum) -> (RangeCheck, core::panics::PanicResult::<(core::felt252,)>);
+examples::match_or::foo@177([0]: RangeCheck, [1]: examples::match_or::MyEnum) -> (RangeCheck, core::panics::PanicResult::<(core::felt252,)>);