@@ -12,13 +12,14 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let arr: Value<Box<[i32]>> = Rc::new(RefCell::new(Box::new([1, 2, 3])));
-    let mut __decomp_0: [i32; 3] = Box::new(std::array::from_fn::<_, 3, _>(|__i: usize| {
-        (*arr.borrow())[(__i) as usize]
-    }));
-    __decomp_0[(0) as usize] = 10;
-    assert!((__decomp_0[(0) as usize] == 10));
-    assert!((__decomp_0[(1) as usize] == 2));
-    assert!((__decomp_0[(2) as usize] == 3));
+    let __decomp_0: Value<Box<[i32]>> =
+        Rc::new(RefCell::new(Box::new(std::array::from_fn::<_, 3, _>(
+            |__i: usize| (*arr.borrow())[(__i) as usize],
+        ))));
+    (*__decomp_0.borrow_mut())[(0) as usize] = 10;
+    assert!(((*__decomp_0.borrow())[(0) as usize] == 10));
+    assert!(((*__decomp_0.borrow())[(1) as usize] == 2));
+    assert!(((*__decomp_0.borrow())[(2) as usize] == 3));
     assert!(((*arr.borrow())[(0) as usize] == 1));
     let __decomp_1: Ptr<i32> = arr.as_pointer();
     elem!((__decomp_1), 0).write(7);
 
@@ -48,21 +48,21 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let s: Value<Counted> = Rc::new(RefCell::new(Counted::new({ 1 }, { 2 })));
-    let mut __decomp_2: Counted = Counted::copy_from({ s.as_pointer() });
+    let __decomp_2: Value<Counted> = Rc::new(RefCell::new(Counted::copy_from({ s.as_pointer() })));
     assert!((copies_0.with(|rc| *rc.borrow()) == 1));
-    assert!((__decomp_2.x == 2));
-    assert!((__decomp_2.y == 4));
+    assert!(({ (*__decomp_2.borrow()).x } == 2));
+    assert!(({ (*__decomp_2.borrow()).y } == 4));
     let __decomp_3: Ptr<Counted> = s.as_pointer();
     assert!((copies_0.with(|rc| *rc.borrow()) == 1));
     assert!((__decomp_3.with(|__s| __s.x) == 1));
     assert!((__decomp_3.with(|__s| __s.y) == 2));
     let __decomp_4: Ptr<Counted> = s.as_pointer();
     assert!((copies_0.with(|rc| *rc.borrow()) == 1));
     assert!((__decomp_4.with(|__s| __s.x) == 1));
-    let mut __decomp_5: Counted = ({ make_counted_1() });
+    let __decomp_5: Value<Counted> = Rc::new(RefCell::new(({ make_counted_1() })));
     assert!((copies_0.with(|rc| *rc.borrow()) == 1));
-    assert!((__decomp_5.x == 5));
-    assert!((__decomp_5.y == 6));
+    assert!(({ (*__decomp_5.borrow()).x } == 5));
+    assert!(({ (*__decomp_5.borrow()).y } == 6));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {
 
@@ -68,22 +68,37 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let m: Value<Movable> = Rc::new(RefCell::new(Movable::new({ 3 }, { 4 })));
-    let mut __decomp_2: Movable = Movable::move_from({ m.as_pointer() });
+    let __decomp_2: Value<Movable> = Rc::new(RefCell::new(Movable::move_from({ m.as_pointer() })));
     assert!((moves_1.with(|rc| *rc.borrow()) == 1));
     assert!((copies_0.with(|rc| *rc.borrow()) == 0));
-    assert!((__decomp_2.x == 3));
-    assert!((__decomp_2.y == 4));
+    assert!(({ (*__decomp_2.borrow()).x } == 3));
+    assert!(({ (*__decomp_2.borrow()).y } == 4));
     assert!(({ (*m.borrow()).x } == 0));
     assert!(({ (*m.borrow()).y } == 0));
     let h: Value<Holder> = Rc::new(RefCell::new(Holder {
         xs: Rc::new(RefCell::new(vec![1, 2, 3])),
         ys: Rc::new(RefCell::new(vec![4, 5])),
     }));
-    let mut __decomp_3: Holder = ({ HolderImpl::extract(&h.as_pointer()) });
-    assert!(((*__decomp_3.xs.borrow()).len() == 3_usize));
-    assert!(((*__decomp_3.ys.borrow()).len() == 2_usize));
-    assert!(((elem!((__decomp_3.xs.as_pointer() as Ptr<i32>), 2_usize).read()) == 3));
-    assert!(((elem!((__decomp_3.ys.as_pointer() as Ptr<i32>), 0_usize).read()) == 4));
+    let __decomp_3: Value<Holder> =
+        Rc::new(RefCell::new(({ HolderImpl::extract(&h.as_pointer()) })));
+    assert!(((*{ (*__decomp_3.borrow()).xs.clone() }.borrow()).len() == 3_usize));
+    assert!(((*{ (*__decomp_3.borrow()).ys.clone() }.borrow()).len() == 2_usize));
+    assert!(
+        ((elem!(
+            ({ (*__decomp_3.borrow()).xs.as_pointer() } as Ptr<i32>),
+            2_usize
+        )
+        .read())
+            == 3)
+    );
+    assert!(
+        ((elem!(
+            ({ (*__decomp_3.borrow()).ys.as_pointer() } as Ptr<i32>),
+            0_usize
+        )
+        .read())
+            == 4)
+    );
     assert!((*{ (*h.borrow()).xs.clone() }.borrow()).is_empty());
     assert!((*{ (*h.borrow()).ys.clone() }.borrow()).is_empty());
     return 0;
 
@@ -42,9 +42,9 @@ fn main_0() -> i32 {
     assert!(({ (*arr.borrow())[(0) as usize].first } == 3));
     assert!(({ (*arr.borrow())[(2) as usize].first } == 11));
     'loop_: for mut __decomp_1 in arr.as_pointer() as Ptr<Pair> {
-        let mut __decomp_1: Pair = __decomp_1.upgrade().deref().clone();
-        __decomp_1.first = 0;
-        __decomp_1.second = 0;
+        let __decomp_1: Value<Pair> = Rc::new(RefCell::new(__decomp_1.upgrade().deref().clone()));
+        (*__decomp_1.borrow_mut()).first = 0;
+        (*__decomp_1.borrow_mut()).second = 0;
     }
     assert!(({ (*arr.borrow())[(1) as usize].first } == 7));
     assert!(({ (*arr.borrow())[(1) as usize].second } == 4));
 
@@ -19,21 +19,21 @@ pub fn main() {
     std::process::exit(main_0());
 }
 fn main_0() -> i32 {
-    let mut __decomp_0: Pair = Pair {
+    let __decomp_0: Value<Pair> = Rc::new(RefCell::new(Pair {
         first: 1,
         second: 2,
-    };
-    assert!((__decomp_0.first == 1));
-    assert!((__decomp_0.second == 2));
+    }));
+    assert!(({ (*__decomp_0.borrow()).first } == 1));
+    assert!(({ (*__decomp_0.borrow()).second } == 2));
     let mut p: Pair = Pair {
         first: 10,
         second: 20,
     };
-    let mut __decomp_1: Pair = (p).clone();
-    __decomp_1.first = 11;
-    __decomp_1.second += 1;
-    assert!((__decomp_1.first == 11));
-    assert!((__decomp_1.second == 21));
+    let __decomp_1: Value<Pair> = Rc::new(RefCell::new((p).clone()));
+    (*__decomp_1.borrow_mut()).first = 11;
+    (*__decomp_1.borrow_mut()).second += 1;
+    assert!(({ (*__decomp_1.borrow()).first } == 11));
+    assert!(({ (*__decomp_1.borrow()).second } == 21));
     assert!((p.first == 10));
     assert!((p.second == 20));
     return 0;