diff --git a/tools/analysis/trace-tools/src/lib/parquet.rs b/tools/analysis/trace-tools/src/lib/parquet.rs
index 43ed191f6f..c62a0651cb 100644
--- a/tools/analysis/trace-tools/src/lib/parquet.rs
+++ b/tools/analysis/trace-tools/src/lib/parquet.rs
@@ -681,16 +681,18 @@ where
                 match buf {
                     Value::U32Array(array) => {
                         let table_state = $table_state;
+                        let mut table_state = RefCell::borrow_mut(table_state);
+                        let mut _table_state = table_state.deref_mut();
 
                         let res = visitor
                         .vbin_fields(print_fmt, &array)
-                        .zip(RefCell::borrow_mut(table_state).field_cols.iter_mut())
+                        .zip(_table_state.field_cols.iter_mut())
                         .map(|(res, col)| {
-                            f(&table_state.borrow().name, col, res.map(|print_arg| print_arg.value))
+                            f(&_table_state.name, col, res.map(|print_arg| print_arg.value))
                         })
                         .collect::<Result<(), MainError>>();
                         match res {
-                            Ok(_) => Ok(DerefMutWrapper::RcRefMut(RefCell::borrow_mut(table_state))),
+                            Ok(_) => Ok(DerefMutWrapper::RcRefMut(table_state)),
                             Err(err) => Err(err)
                         }
                     }