RustPython
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/compiler-core/Cargo.toml b/crates/compiler-core/Cargo.toml
@@ -17,6 +17,7 @@ bitflags = { workspace = true }
 itertools = { workspace = true }
 malachite-bigint = { workspace = true }
 num-complex = { workspace = true }
+num_enum = { workspace = true }
 
 lz4_flex = "0.12"
 

diff --git a/crates/compiler-core/src/bytecode/instruction.rs b/crates/compiler-core/src/bytecode/instruction.rs
@@ -1249,7 +1249,7 @@ impl<T: OpArgType> Arg<T> {
 
     #[inline]
     pub fn new(arg: T) -> (Self, OpArg) {
-        (Self(PhantomData), OpArg(arg.to_op_arg()))
+        (Self(PhantomData), OpArg(arg.into()))
     }
 
     #[inline]
@@ -1267,15 +1267,15 @@ impl<T: OpArgType> Arg<T> {
 
     #[inline(always)]
     pub fn try_get(self, arg: OpArg) -> Result<T, MarshalError> {
-        T::from_op_arg(arg.0)
+        T::try_from(arg.0).map_err(|_| MarshalError::InvalidBytecode)
     }
 
     /// # Safety
     /// T::from_op_arg(self) must succeed
     #[inline(always)]
     pub unsafe fn get_unchecked(self, arg: OpArg) -> T {
         // SAFETY: requirements forwarded from caller
-        unsafe { T::from_op_arg(arg.0).unwrap_unchecked() }
+        unsafe { T::try_from(arg.0).unwrap_unchecked() }
     }
 }