Repository: denoland/deno_core
Pull request #625 (2024-03-01 00:53:51)

refactor(core): Add name_fast to new_internal_op2 (unused)
Split from #620 

codecov-commenter: ## [Codecov](https://app.codecov.io/gh/denoland/deno_core/pull/625?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=denoland) Report
Attention: Patch coverage is `15.38462%` with `11 lines` in your changes are missing coverage. Please review.
> Project coverage is 82.02%. Comparing base [(`e42470d`)](https://app.codecov.io/gh/denoland/deno_core/commit/e42470db922eabd75984d82f413c0f043e396dd7?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=denoland) to head [(`4622daf`)](https://app.codecov.io/gh/denoland/deno_core/pull/625?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=denoland).

| [Files](https://app.codecov.io/gh/denoland/deno_core/pull/625?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=denoland) | Patch % | Lines |
|---|---|---|
| [core/extensions.rs](https://app.codecov.io/gh/denoland/deno_core/pull/625?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=denoland#diff-Y29yZS9leHRlbnNpb25zLnJz) | 0.00% | [11 Missing :warning: ](https://app.codecov.io/gh/denoland/deno_core/pull/625?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=denoland) |

<details><summary>Additional details and impacted files</summary>


```diff
@@            Coverage Diff             @@
##             main     #625      +/-   ##
==========================================
- Coverage   82.03%   82.02%   -0.01%     
==========================================
  Files          96       96              
  Lines       23281    23283       +2     
==========================================
+ Hits        19098    19099       +1     
- Misses       4183     4184       +1     
```



</details>

[:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/denoland/deno_core/pull/625?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=denoland).   
:loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=denoland).


Patch:
diff --git a/core/benches/ops/async.rs b/core/benches/ops/async.rs
index a30b282..84656ff 100644
--- a/core/benches/ops/async.rs
+++ b/core/benches/ops/async.rs
@@ -138,7 +138,7 @@ fn bench_op(
 
   // Prime the optimizer
   runtime
-    .execute_script("", FastString::Owned(harness.into()))
+    .execute_script("", harness)
     .map_err(err_mapper)
     .unwrap();
   let guard = tokio.enter();
diff --git a/core/benches/ops/sync.rs b/core/benches/ops/sync.rs
index 017acb1..9f483ea 100644
--- a/core/benches/ops/sync.rs
+++ b/core/benches/ops/sync.rs
@@ -191,7 +191,7 @@ fn bench_op(
 
   // Prime the optimizer
   runtime
-    .execute_script("", FastString::Owned(harness.into()))
+    .execute_script("", harness)
     .map_err(err_mapper)
     .unwrap();
   let bench = runtime.execute_script("", ascii_str!("bench")).unwrap();
diff --git a/core/examples/disable_ops.rs b/core/examples/disable_ops.rs
index d5c2ad3..45dc70d 100644
--- a/core/examples/disable_ops.rs
+++ b/core/examples/disable_ops.rs
@@ -24,6 +24,6 @@ fn main() {
 
   // Deno.core.print() will now be a NOP
   runtime
-    .execute_script_static("<usage>", r#"Deno.core.print("I'm broken")"#)
+    .execute_script("<usage>", r#"Deno.core.print("I'm broken")"#)
     .unwrap();
 }
diff --git a/core/examples/eval_js_value.rs b/core/examples/eval_js_value.rs
index fb9c54e..30d4128 100644
--- a/core/examples/eval_js_value.rs
+++ b/core/examples/eval_js_value.rs
@@ -28,7 +28,7 @@ fn eval(
   context: &mut JsRuntime,
   code: &'static str,
 ) -> Result<serde_json::Value, String> {
-  let res = context.execute_script_static("<anon>", code);
+  let res = context.execute_script("<anon>", code);
   match res {
     Ok(global) => {
       let scope = &mut context.handle_scope();
diff --git a/core/examples/hello_world.rs b/core/examples/hello_world.rs
index b57055d..080b632 100644
--- a/core/examples/hello_world.rs
+++ b/core/examples/hello_world.rs
@@ -32,7 +32,7 @@ fn main() {
   // contains a Deno.core object with several functions for interacting with it.
   // You can find its definition in core.js.
   runtime
-    .execute_script_static(
+    .execute_script(
       "<usage>",
       r#"
 // Print helper function, calling Deno.core.print()
diff --git a/core/extensions.rs b/core/extensions.rs
index 6c6edab..155abc7 100644
--- a/core/extensions.rs
+++ b/core/extensions.rs
@@ -242,18 +242,16 @@ impl OpDecl {
 
   /// Returns a copy of this `OpDecl` with the implementation function set to the function from another
   /// `OpDecl`.
-  pub const fn with_implementation_from(self, from: &Self) -> Self {
-    Self {
-      slow_fn: from.slow_fn,
-      slow_fn_with_metrics: from.slow_fn_with_metrics,
-      fast_fn: from.fast_fn,
-      fast_fn_with_metrics: from.fast_fn_with_metrics,
-      ..self
-    }
+  pub const fn with_implementation_from(mut self, from: &Self) -> Self {
+    self.slow_fn = from.slow_fn;
+    self.slow_fn_with_metrics = from.slow_fn_with_metrics;
+    self.fast_fn = from.fast_fn;
+    self.fast_fn_with_metrics = from.fast_fn_with_metrics;
+    self
   }
 
   #[doc(hidden)]
-  pub const fn fast_fn(self) -> FastFunction {
+  pub const fn fast_fn(&self) -> FastFunction {
     let Some(f) = self.fast_fn else {
       panic!("Not a fast function");
     };
@@ -261,7 +259,7 @@ impl OpDecl {
   }
 
   #[doc(hidden)]
-  pub const fn fast_fn_with_metrics(self) -> FastFunction {
+  pub const fn fast_fn_with_metrics(&self) -> FastFunction {
     let Some(f) = self.fast_fn_with_metrics else {
       panic!("Not a fast function");
     };
diff --git a/core/fast_string.rs b/core/fast_string.rs
index cc1079a..aea5807 100644
--- a/core/fast_string.rs
+++ b/core/fast_string.rs
@@ -187,6 +187,14 @@ impl PartialEq for FastString {
 
 impl Eq for FastString {}
 
+/// [`FastString`] can be made cheaply from `&'static str` as we know it's owned and don't need to do an
+/// ASCII check.
+impl From<&'static str> for FastString {
+  fn from(value: &'static str) -> Self {
+    FastString::from_static(value)
+  }
+}
+
 /// [`FastString`] can be made cheaply from [`Url`] as we know it's owned and don't need to do an
 /// ASCII check.
 impl From<Url> for FastString {
@@ -246,11 +254,18 @@ macro_rules! include_ascii_string {
 /// 7-bit ASCII for optimal v8 performance.
 #[macro_export]
 macro_rules! ascii_str {
-  ($str:literal) => {
+  ($str:expr) => {
     $crate::FastString::ensure_static_ascii($str)
   };
 }
 
+#[macro_export]
+macro_rules! __op_name_fast {
+  ($op:ident) => {
+    stringify!($op)
+  };
+}
+
 #[cfg(test)]
 mod tests {
   use super::*;
diff --git a/core/modules/loaders.rs b/core/modules/loaders.rs
index 3f1df07..228d03b 100644
--- a/core/modules/loaders.rs
+++ b/core/modules/loaders.rs
@@ -330,6 +330,7 @@ impl ModuleLoader for FsModuleLoader {
 
 /// A module loader that you can pre-load a number of modules into and resolve from. Useful for testing and
 /// embedding situations where the filesystem and snapshot systems are not usable or a good fit.
+#[derive(Default)]
 pub struct StaticModuleLoader {
   map: HashMap<ModuleSpecifier, ModuleCodeString>,
 }
diff --git a/core/runtime/jsrealm.rs b/core/runtime/jsrealm.rs
index 7770007..7ffb766 100644
--- a/core/runtime/jsrealm.rs
+++ b/core/runtime/jsrealm.rs
@@ -247,34 +247,6 @@ impl JsRealm {
     unsafe { self.0.context.get_unchecked() as *const _ as _ }
   }
 
-  /// Executes traditional JavaScript code (traditional = not ES modules) in the
-  /// realm's context.
-  ///
-  /// For info on the [`v8::Isolate`] parameter, check [`JsRealm#panics`].
-  ///
-  /// The `name` parameter can be a filepath or any other string. E.g.:
-  ///
-  ///   - "/some/file/path.js"
-  ///   - "<anon>"
-  ///   - "[native code]"
-  ///
-  /// The same `name` value can be used for multiple executions.
-  ///
-  /// `Error` can usually be downcast to `JsError`.
-  #[cfg(test)]
-  pub fn execute_script_static(
-    &self,
-    isolate: &mut v8::Isolate,
-    name: &'static str,
-    source_code: &'static str,
-  ) -> Result<v8::Global<v8::Value>, Error> {
-    self.execute_script(
-      isolate,
-      name,
-      ModuleCodeString::from_static(source_code),
-    )
-  }
-
   /// Executes traditional JavaScript code (traditional = not ES modules) in the
   /// realm's context.
   ///
@@ -293,8 +265,9 @@ impl JsRealm {
     &self,
     isolate: &mut v8::Isolate,
     name: &'static str,
-    source_code: ModuleCodeString,
+    source_code: impl Into<ModuleCodeString>,
   ) -> Result<v8::Global<v8::Value>, Error> {
+    let source_code = source_code.into();
     let scope = &mut self.0.handle_scope(isolate);
 
     let source = source_code.v8_string(scope);
diff --git a/core/runtime/jsruntime.rs b/core/runtime/jsruntime.rs
index e723227..f1908d9 100644
--- a/core/runtime/jsruntime.rs
+++ b/core/runtime/jsruntime.rs
@@ -1282,7 +1282,7 @@ impl JsRuntime {
   pub fn execute_script(
     &mut self,
     name: &'static str,
-    source_code: ModuleCodeString,
+    source_code: impl Into<ModuleCodeString>,
   ) -> Result<v8::Global<v8::Value>, Error> {
     let isolate = &mut self.inner.v8_isolate;
     self
@@ -1291,33 +1291,6 @@ impl JsRuntime {
       .execute_script(isolate, name, source_code)
   }
 
-  /// Executes traditional JavaScript code (traditional = not ES modules).
-  ///
-  /// The execution takes place on the current main realm, so it is possible
-  /// to maintain local JS state and invoke this method multiple times.
-  ///
-  /// `name` can be a filepath or any other string, but it is required to be 7-bit ASCII, eg.
-  ///
-  ///   - "/some/file/path.js"
-  ///   - "<anon>"
-  ///   - "[native code]"
-  ///
-  /// The same `name` value can be used for multiple executions.
-  ///
-  /// `Error` can usually be downcast to `JsError`.
-  pub fn execute_script_static(
-    &mut self,
-    name: &'static str,
-    source_code: &'static str,
-  ) -> Result<v8::Global<v8::Value>, Error> {
-    let isolate = &mut self.inner.v8_isolate;
-    self.inner.main_realm.execute_script(
-      isolate,
-      name,
-      ModuleCodeString::from_static(source_code),
-    )
-  }
-
   /// Call a function and return a future resolving with the return value of the
   /// function. If the function returns a promise, the future will resolve only once the
   /// event loop resolves the underlying promise. If the future rejects, the future will
diff --git a/core/runtime/ops.rs b/core/runtime/ops.rs
index f825198..2721913 100644
--- a/core/runtime/ops.rs
+++ b/core/runtime/ops.rs
@@ -521,7 +521,6 @@ mod tests {
   use crate::external::ExternalPointer;
   use crate::op2;
   use crate::runtime::JsRuntimeState;
-  use crate::FastString;
   use crate::JsRuntime;
   use crate::OpState;
   use crate::RuntimeOptions;
@@ -659,39 +658,31 @@ mod tests {
     runtime
       .execute_script(
         "",
-        FastString::Owned(
-          format!(
-            r"
-            const {{ op_test_fail, op_test_print_debug, {op} }} = Deno.core.ensureFastOps();
-            function assert(b) {{
-              if (!b) {{
-                op_test_fail();
-              }}
+        format!(r"
+          const {{ op_test_fail, op_test_print_debug, {op} }} = Deno.core.ensureFastOps();
+          function assert(b) {{
+            if (!b) {{
+              op_test_fail();
             }}
-            function assertErrorContains(e, s) {{
-              assert(String(e).indexOf(s) != -1)
-            }}
-            function log(s) {{
-              op_test_print_debug(String(s))
-            }}
-          "
-          )
-          .into(),
-        ),
+          }}
+          function assertErrorContains(e, s) {{
+            assert(String(e).indexOf(s) != -1)
+          }}
+          function log(s) {{
+            op_test_print_debug(String(s))
+          }}
+        ")
       )
       .map_err(err_mapper)?;
     FAIL.with(|b| b.set(false));
     runtime.execute_script(
       "",
-      FastString::Owned(
-        format!(
-          r"
-      for (let __index__ = 0; __index__ < {repeat}; __index__++) {{
-        {test}
-      }}
-    "
-        )
-        .into(),
+      format!(
+        r"
+        for (let __index__ = 0; __index__ < {repeat}; __index__++) {{
+          {test}
+        }}
+      "
       ),
     )?;
     if FAIL.with(|b| b.get()) {
@@ -716,41 +707,33 @@ mod tests {
     runtime
       .execute_script(
         "",
-        FastString::Owned(
-          format!(
-            r"
-            const {{ op_test_fail, op_test_print_debug, {op} }} = Deno.core.ensureFastOps();
-            function assert(b) {{
-              if (!b) {{
-                op_test_fail();
-              }}
+        format!(r"
+          const {{ op_test_fail, op_test_print_debug, {op} }} = Deno.core.ensureFastOps();
+          function assert(b) {{
+            if (!b) {{
+              op_test_fail();
             }}
-            function assertErrorContains(e, s) {{
-              assert(String(e).indexOf(s) != -1)
-            }}
-            function log(s) {{
-              op_test_print_debug(String(s))
-            }}
-          "
-          )
-          .into(),
-        ),
+          }}
+          function assertErrorContains(e, s) {{
+            assert(String(e).indexOf(s) != -1)
+          }}
+          function log(s) {{
+            op_test_print_debug(String(s))
+          }}
+        ")
       )
       .map_err(err_mapper)?;
     FAIL.with(|b| b.set(false));
     runtime.execute_script(
       "",
-      FastString::Owned(
-        format!(
-          r"
-            (async () => {{
-              for (let __index__ = 0; __index__ < {repeat}; __index__++) {{
-                {test}
-              }}
-            }})()
-          "
-        )
-        .into(),
+      format!(
+        r"
+        (async () => {{
+          for (let __index__ = 0; __index__ < {repeat}; __index__++) {{
+            {test}
+          }}
+        }})()
+      "
       ),
     )?;
 
diff --git a/core/runtime/snapshot.rs b/core/runtime/snapshot.rs
index 09c7f7e..97ff65e 100644
--- a/core/runtime/snapshot.rs
+++ b/core/runtime/snapshot.rs
@@ -178,7 +178,7 @@ pub fn create_snapshot(
       with_runtime_cb(&mut js_runtime);
     }
 
-    js_runtime.execute_script_static("warmup", warmup_script)?;
+    js_runtime.execute_script("warmup", warmup_script)?;
 
     snapshot = js_runtime.snapshot();
   }
diff --git a/ops/op2/mod.rs b/ops/op2/mod.rs
index 2d14df0..d51ad8f 100644
--- a/ops/op2/mod.rs
+++ b/ops/op2/mod.rs
@@ -248,10 +248,10 @@ fn generate_op2(
       _unconstructable: ::std::marker::PhantomData<(#(#generic),*)>
     }
 
-    impl <#(#generic : #bound),*> deno_core::_ops::Op for #name <#(#generic),*> {
+    impl <#(#generic : #bound),*> ::deno_core::_ops::Op for #name <#(#generic),*> {
       const NAME: &'static str = stringify!(#name);
-      const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        /*name*/ stringify!(#name),
+      const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        /*name*/ ::deno_core::__op_name_fast!(#name),
         /*is_async*/ #is_async,
         /*is_reentrant*/ #is_reentrant,
         /*arg_count*/ #arg_count as u8,


Test patch:
diff --git a/core/modules/tests.rs b/core/modules/tests.rs
index d7edb34..e78d4bd 100644
--- a/core/modules/tests.rs
+++ b/core/modules/tests.rs
@@ -344,7 +344,7 @@ fn test_mods() {
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "setup.js",
       r#"
       function assert(cond) {
@@ -426,7 +426,7 @@ fn test_lazy_loaded_esm() {
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "setup.js",
       r#"
       Deno.core.print("1\n");
@@ -442,14 +442,14 @@ fn test_lazy_loaded_esm() {
 
 #[test]
 fn test_json_module() {
-  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::new([])));
+  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::default()));
   let mut runtime = JsRuntime::new(RuntimeOptions {
     module_loader: Some(loader.clone()),
     ..Default::default()
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "setup.js",
       r#"
         function assert(cond) {
@@ -552,7 +552,7 @@ fn test_validate_import_attributes_default() {
   // Verify that unless `validate_import_attributes_cb` is passed all import
   // are allowed and don't have any problem executing "invalid" code.
 
-  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::new([])));
+  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::default()));
   let mut runtime = JsRuntime::new(RuntimeOptions {
     module_loader: Some(loader.clone()),
     ..Default::default()
@@ -610,7 +610,7 @@ fn test_validate_import_attributes_callback() {
     }
   }
 
-  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::new([])));
+  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::default()));
   let mut runtime = JsRuntime::new(RuntimeOptions {
     module_loader: Some(loader.clone()),
     validate_import_attributes_cb: Some(Box::new(validate_import_attributes)),
@@ -679,7 +679,7 @@ fn test_validate_import_attributes_callback2() {
     scope.throw_exception(ex);
   }
 
-  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::new([])));
+  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::default()));
   let mut runtime = JsRuntime::new(RuntimeOptions {
     module_loader: Some(loader.clone()),
     validate_import_attributes_cb: Some(Box::new(validate_import_attrs)),
@@ -712,7 +712,7 @@ fn test_validate_import_attributes_callback2() {
 
 #[test]
 fn test_custom_module_type_default() {
-  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::new([])));
+  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::default()));
   let mut runtime = JsRuntime::new(RuntimeOptions {
     module_loader: Some(loader.clone()),
     ..Default::default()
@@ -778,7 +778,7 @@ fn test_custom_module_type_callback_synthetic() {
     Ok(CustomModuleEvaluationKind::Synthetic(value_global))
   }
 
-  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::new([])));
+  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::default()));
   let mut runtime = JsRuntime::new(RuntimeOptions {
     module_loader: Some(loader.clone()),
     custom_module_evaluation_cb: Some(Box::new(custom_eval_cb)),
@@ -873,7 +873,7 @@ export const foo = bytes;
     ))
   }
 
-  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::new([])));
+  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::default()));
   let mut runtime = JsRuntime::new(RuntimeOptions {
     module_loader: Some(loader.clone()),
     custom_module_evaluation_cb: Some(Box::new(custom_eval_cb)),
@@ -933,7 +933,7 @@ export const foo = bytes;
 
 #[tokio::test]
 async fn dyn_import_err() {
-  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::new([])));
+  let loader = Rc::new(TestingModuleLoader::new(StaticModuleLoader::default()));
   let mut runtime = JsRuntime::new(RuntimeOptions {
     module_loader: Some(loader.clone()),
     ..Default::default()
@@ -942,7 +942,7 @@ async fn dyn_import_err() {
   // Test an erroneous dynamic import where the specified module isn't found.
   poll_fn(move |cx| {
     runtime
-      .execute_script_static(
+      .execute_script(
         "file:///dyn_import2.js",
         r#"
       (async () => {
@@ -974,7 +974,7 @@ async fn dyn_import_ok() {
   poll_fn(move |cx| {
     // Dynamically import mod_b
     runtime
-      .execute_script_static(
+      .execute_script(
         "file:///dyn_import3.js",
         r#"
         (async () => {
@@ -1021,7 +1021,7 @@ async fn dyn_import_borrow_mut_error() {
 
   poll_fn(move |cx| {
     runtime
-      .execute_script_static(
+      .execute_script(
         "file:///dyn_import3.js",
         r#"
         (async () => {
@@ -1434,7 +1434,7 @@ fn dynamic_imports_snapshot() {
   });
 
   //Evaluate the snapshot with an empty function
-  runtime2.execute_script_static("check.js", "true").unwrap();
+  runtime2.execute_script("check.js", "true").unwrap();
 }
 
 #[test]
@@ -1477,7 +1477,7 @@ fn import_meta_snapshot() {
   });
 
   runtime2
-    .execute_script_static(
+    .execute_script(
       "check.js",
       "if (globalThis.url !== 'file:///main_with_code.js') throw Error('x')",
     )
diff --git a/core/runtime/tests/error.rs b/core/runtime/tests/error.rs
index 47ae5fb..82ae74f 100644
--- a/core/runtime/tests/error.rs
+++ b/core/runtime/tests/error.rs
@@ -27,7 +27,7 @@ async fn test_error_builder() {
   });
   poll_fn(move |cx| {
     runtime
-      .execute_script_static(
+      .execute_script(
         "error_builder_test.js",
         include_str!("error_builder_test.js"),
       )
@@ -45,7 +45,7 @@ async fn test_error_builder() {
 fn syntax_error() {
   let mut runtime = JsRuntime::new(Default::default());
   let src = "hocuspocus(";
-  let r = runtime.execute_script_static("i.js", src);
+  let r = runtime.execute_script("i.js", src);
   let e = r.unwrap_err();
   let js_error = e.downcast::<JsError>().unwrap();
   let frame = js_error.frames.first().unwrap();
diff --git a/core/runtime/tests/jsrealm.rs b/core/runtime/tests/jsrealm.rs
index a942e96..e34dc13 100644
--- a/core/runtime/tests/jsrealm.rs
+++ b/core/runtime/tests/jsrealm.rs
@@ -28,8 +28,7 @@ fn test_set_format_exception_callback_realms() {
               return `{realm_name} / ${{error}}`;
             }});
           "#
-        )
-        .into(),
+        ),
       )
       .unwrap();
   }
@@ -40,7 +39,7 @@ fn test_set_format_exception_callback_realms() {
       let result = realm.execute_script(
         runtime.v8_isolate(),
         "",
-        format!("throw new Error('{realm_name}');").into(),
+        format!("throw new Error('{realm_name}');"),
       );
       assert!(result.is_err());
 
@@ -57,7 +56,7 @@ fn test_set_format_exception_callback_realms() {
         .execute_script(
           runtime.v8_isolate(),
           "",
-          format!("Promise.reject(new Error('{realm_name}'));").into(),
+          format!("Promise.reject(new Error('{realm_name}'));"),
         )
         .unwrap();
 
@@ -91,7 +90,7 @@ async fn js_realm_ref_unref_ops() {
     let main_realm = runtime.main_realm();
 
     main_realm
-      .execute_script_static(
+      .execute_script(
         runtime.v8_isolate(),
         "",
         r#"
@@ -106,7 +105,7 @@ async fn js_realm_ref_unref_ops() {
     ));
 
     main_realm
-      .execute_script_static(
+      .execute_script(
         runtime.v8_isolate(),
         "",
         r#"
@@ -136,7 +135,7 @@ fn es_snapshot() {
 
     let runtime = JsRuntimeForSnapshot::new(RuntimeOptions {
       extensions: vec![module_snapshot::init_ops_and_esm()],
-      module_loader: Some(Rc::new(StaticModuleLoader::new([]))),
+      module_loader: Some(Rc::new(StaticModuleLoader::default())),
       ..Default::default()
     });
     runtime.snapshot()
@@ -150,9 +149,7 @@ fn es_snapshot() {
 
   // The module was evaluated ahead of time
   {
-    let global_test = runtime
-      .execute_script_static("", "globalThis.TEST")
-      .unwrap();
+    let global_test = runtime.execute_script("", "globalThis.TEST").unwrap();
     let scope = &mut runtime.handle_scope();
     let global_test = v8::Local::new(scope, global_test);
     assert!(global_test.is_string());
@@ -162,10 +159,7 @@ fn es_snapshot() {
   // The module can be imported
   {
     let test_export_promise = runtime
-      .execute_script_static(
-        "",
-        "import('mod:test').then(module => module.TEST)",
-      )
+      .execute_script("", "import('mod:test').then(module => module.TEST)")
       .unwrap();
     #[allow(deprecated)]
     let test_export =
diff --git a/core/runtime/tests/misc.rs b/core/runtime/tests/misc.rs
index d6e8a26..8cb1cf9 100644
--- a/core/runtime/tests/misc.rs
+++ b/core/runtime/tests/misc.rs
@@ -29,23 +29,20 @@ fn icu() {
   // rusty_v8/third_party/icu/common/icudtl.dat
   let mut runtime = JsRuntime::new(Default::default());
   runtime
-    .execute_script_static("a.js", "(new Date()).toLocaleString('ja-JP')")
+    .execute_script("a.js", "(new Date()).toLocaleString('ja-JP')")
     .unwrap();
 }
 
 #[test]
 fn test_execute_script_return_value() {
   let mut runtime = JsRuntime::new(Default::default());
-  let value_global =
-    runtime.execute_script_static("a.js", "a = 1 + 2").unwrap();
+  let value_global = runtime.execute_script("a.js", "a = 1 + 2").unwrap();
   {
     let scope = &mut runtime.handle_scope();
     let value = value_global.open(scope);
     assert_eq!(value.integer_value(scope).unwrap(), 3);
   }
-  let value_global = runtime
-    .execute_script_static("b.js", "b = 'foobar'")
-    .unwrap();
+  let value_global = runtime.execute_script("b.js", "b = 'foobar'").unwrap();
   {
     let scope = &mut runtime.handle_scope();
     let value = value_global.open(scope);
@@ -156,7 +153,7 @@ async fn test_resolve_promise(
   #[case] result: Result<i32, &'static str>,
 ) {
   let mut runtime = JsRuntime::new(Default::default());
-  let value_global = runtime.execute_script_static("a.js", script).unwrap();
+  let value_global = runtime.execute_script("a.js", script).unwrap();
   let resolve = runtime.resolve(value_global);
   let out = runtime
     .with_event_loop_promise(resolve, PollEventLoopOptions::default())
@@ -242,11 +239,11 @@ async fn test_resolve_value_generic(
   let mut runtime = JsRuntime::new(Default::default());
   let result_global = if runner == "script" {
     let value_global: v8::Global<v8::Value> =
-      runtime.execute_script_static("a.js", code).unwrap();
+      runtime.execute_script("a.js", code).unwrap();
     #[allow(deprecated)]
     runtime.resolve_value(value_global).await
   } else if runner == "call" {
-    let value_global = runtime.execute_script_static("a.js", code).unwrap();
+    let value_global = runtime.execute_script("a.js", code).unwrap();
     let function: v8::Global<v8::Function> =
       unsafe { std::mem::transmute(value_global) };
     #[allow(deprecated)]
@@ -289,7 +286,7 @@ fn terminate_execution_webassembly() {
   let v8_isolate_handle = runtime.v8_isolate().thread_safe_handle();
 
   // Run an infinite loop in WebAssembly code, which should be terminated.
-  let promise = runtime.execute_script_static("infinite_wasm_loop.js",
+  let promise = runtime.execute_script("infinite_wasm_loop.js",
                                r#"
                                (async () => {
                                 const wasmCode = new Uint8Array([
@@ -313,7 +310,7 @@ fn terminate_execution_webassembly() {
     assert!(ok);
   });
   let err = runtime
-    .execute_script_static(
+    .execute_script(
       "infinite_wasm_loop2.js",
       "globalThis.wasmInstance.exports.infinite_loop();",
     )
@@ -326,7 +323,7 @@ fn terminate_execution_webassembly() {
 
   // Verify that the isolate usable again.
   runtime
-    .execute_script_static("simple.js", "1 + 1")
+    .execute_script("simple.js", "1 + 1")
     .expect("execution should be possible again");
 
   terminator_thread.join().unwrap();
@@ -347,7 +344,7 @@ fn terminate_execution() {
   });
 
   // Rn an infinite loop, which should be terminated.
-  match isolate.execute_script_static("infinite_loop.js", "for(;;) {}") {
+  match isolate.execute_script("infinite_loop.js", "for(;;) {}") {
     Ok(_) => panic!("execution should be terminated"),
     Err(e) => {
       assert_eq!(e.to_string(), "Uncaught Error: execution terminated")
@@ -361,7 +358,7 @@ fn terminate_execution() {
 
   // Verify that the isolate usable again.
   isolate
-    .execute_script_static("simple.js", "1 + 1")
+    .execute_script("simple.js", "1 + 1")
     .expect("execution should be possible again");
 
   terminator_thread.join().unwrap();
@@ -372,7 +369,7 @@ async fn wasm_streaming_op_invocation_in_import() {
   let (mut runtime, _dispatch_count) = setup(Mode::Async);
 
   // Run an infinite loop in WebAssembly code, which should be terminated.
-  runtime.execute_script_static("setup.js",
+  runtime.execute_script("setup.js",
                                r#"
                                 Deno.core.setWasmStreamingCallback((source, rid) => {
                                   Deno.core.ops.op_wasm_streaming_set_url(rid, "file:///foo.wasm");
@@ -381,7 +378,7 @@ async fn wasm_streaming_op_invocation_in_import() {
                                 });
                                "#).unwrap();
 
-  let promise = runtime.execute_script_static("main.js",
+  let promise = runtime.execute_script("main.js",
                             r#"
                              // (module (import "env" "data" (global i64)))
                              const bytes = new Uint8Array([0,97,115,109,1,0,0,0,2,13,1,3,101,110,118,4,100,97,116,97,3,126,0,0,8,4,110,97,109,101,2,1,0]);
@@ -421,7 +418,7 @@ fn inspector() {
   });
   // This was causing a crash
   runtime.op_state().borrow_mut().put(runtime.inspector());
-  runtime.execute_script_static("check.js", "null").unwrap();
+  runtime.execute_script("check.js", "null").unwrap();
 }
 
 #[test]
@@ -499,7 +496,7 @@ fn test_heap_limits() {
     current_limit * 2
   });
   let err = runtime
-    .execute_script_static(
+    .execute_script(
       "script name",
       r#"let s = ""; while(true) { s += "Hello"; }"#,
     )
@@ -548,7 +545,7 @@ fn test_heap_limit_cb_multiple() {
   });
 
   let err = runtime
-    .execute_script_static(
+    .execute_script(
       "script name",
       r#"let s = ""; while(true) { s += "Hello"; }"#,
     )
@@ -566,7 +563,7 @@ async fn test_pump_message_loop() {
   let mut runtime = JsRuntime::new(RuntimeOptions::default());
   poll_fn(move |cx| {
     runtime
-      .execute_script_static(
+      .execute_script(
         "pump_message_loop.js",
         r#"
 function assertEquals(a, b) {
@@ -596,12 +593,12 @@ assertEquals(1, notify_return_value);
 
     // noop script, will resolve promise from first script
     runtime
-      .execute_script_static("pump_message_loop2.js", r#"assertEquals(1, 1);"#)
+      .execute_script("pump_message_loop2.js", r#"assertEquals(1, 1);"#)
       .unwrap();
 
     // check that promise from `Atomics.waitAsync` has been resolved
     runtime
-      .execute_script_static(
+      .execute_script(
         "pump_message_loop3.js",
         r#"assertEquals(globalThis.resolved, true);"#,
       )
@@ -618,7 +615,7 @@ fn test_v8_platform() {
     ..Default::default()
   };
   let mut runtime = JsRuntime::new(options);
-  runtime.execute_script_static("<none>", "").unwrap();
+  runtime.execute_script("<none>", "").unwrap();
 }
 
 #[ignore] // TODO(@littledivy): Fast API ops when snapshot is not loaded.
@@ -626,7 +623,7 @@ fn test_v8_platform() {
 fn test_is_proxy() {
   let mut runtime = JsRuntime::new(RuntimeOptions::default());
   let all_true: v8::Global<v8::Value> = runtime
-    .execute_script_static(
+    .execute_script(
       "is_proxy.js",
       r#"
     (function () {
@@ -658,7 +655,7 @@ async fn test_set_macrotask_callback_set_next_tick_callback() {
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "macrotasks_and_nextticks.js",
       r#"
       const { op_async_sleep } = Deno.core.ensureFastOps();
@@ -713,7 +710,7 @@ fn test_has_tick_scheduled() {
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "has_tick_scheduled.js",
       r#"
         Deno.core.setMacrotaskCallback(() => {
@@ -864,7 +861,7 @@ async fn test_promise_rejection_handler_generic(
       .unwrap();
     Some(runtime.mod_evaluate(id))
   } else {
-    runtime.execute_script("", script.into()).unwrap();
+    runtime.execute_script("", script).unwrap();
     None
   };
 
@@ -1039,7 +1036,7 @@ async fn tla_in_esm_extensions_panics() {
 
   // Panics
   let _runtime = JsRuntime::new(RuntimeOptions {
-    module_loader: Some(Rc::new(StaticModuleLoader::new([]))),
+    module_loader: Some(Rc::new(StaticModuleLoader::default())),
     extensions: vec![test_ext::init_ops_and_esm()],
     ..Default::default()
   });
@@ -1076,7 +1073,7 @@ async fn esm_extensions_throws() {
 
   // Panics
   let _runtime = JsRuntime::new(RuntimeOptions {
-    module_loader: Some(Rc::new(StaticModuleLoader::new([]))),
+    module_loader: Some(Rc::new(StaticModuleLoader::default())),
     extensions: vec![test_ext::init_ops_and_esm()],
     ..Default::default()
   });
@@ -1197,7 +1194,7 @@ async fn terminate_execution_run_event_loop_js() {
 
   // Create sleep function that waits for 2 seconds.
   runtime
-    .execute_script_static(
+    .execute_script(
       "sleep_code.js",
       r#"
               const { op_async_sleep } = Deno.core.ensureFastOps(); 
@@ -1217,9 +1214,7 @@ async fn terminate_execution_run_event_loop_js() {
   });
 
   // Start waiting period of 2 seconds.
-  runtime
-    .execute_script_static("sleep.js", "sleep()")
-    .unwrap();
+  runtime.execute_script("sleep.js", "sleep()").unwrap();
 
   let err = runtime
     .run_event_loop(Default::default())
@@ -1234,7 +1229,7 @@ async fn terminate_execution_run_event_loop_js() {
 
   // Verify that the isolate usable again.
   runtime
-    .execute_script_static("simple.js", "1 + 1")
+    .execute_script("simple.js", "1 + 1")
     .expect("execution should be possible again");
 
   terminator_thread.join().unwrap();
diff --git a/core/runtime/tests/mod.rs b/core/runtime/tests/mod.rs
index 26ac948..1d31036 100644
--- a/core/runtime/tests/mod.rs
+++ b/core/runtime/tests/mod.rs
@@ -88,7 +88,7 @@ fn setup(mode: Mode) -> (JsRuntime, Arc<AtomicUsize>) {
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "setup.js",
       r#"
       function assert(cond) {
diff --git a/core/runtime/tests/ops.rs b/core/runtime/tests/ops.rs
index 10c6d09..ad63985 100644
--- a/core/runtime/tests/ops.rs
+++ b/core/runtime/tests/ops.rs
@@ -49,7 +49,7 @@ async fn test_async_opstate_borrow() {
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "op_async_borrow.js",
       "const { op_async_borrow } = Deno.core.ensureFastOps(); op_async_borrow();",
     )
@@ -80,7 +80,7 @@ async fn test_sync_op_serialize_object_with_numbers_as_keys() {
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "op_sync_serialize_object_with_numbers_as_keys.js",
       r#"
 Deno.core.ops.op_sync_serialize_object_with_numbers_as_keys({
@@ -122,7 +122,7 @@ async fn test_async_op_serialize_object_with_numbers_as_keys() {
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "op_async_serialize_object_with_numbers_as_keys.js",
       r#"
         const { op_async_serialize_object_with_numbers_as_keys } = Deno.core.ensureFastOps();
@@ -156,7 +156,7 @@ fn test_op_return_serde_v8_error() {
     ..Default::default()
   });
   assert!(runtime
-    .execute_script_static(
+    .execute_script(
       "test_op_return_serde_v8_error.js",
       "Deno.core.ops.op_err()"
     )
@@ -182,7 +182,7 @@ fn test_op_high_arity() {
     ..Default::default()
   });
   let r = runtime
-    .execute_script_static("test.js", "Deno.core.ops.op_add_4(1, 2, 3, 4)")
+    .execute_script("test.js", "Deno.core.ops.op_add_4(1, 2, 3, 4)")
     .unwrap();
   let scope = &mut runtime.handle_scope();
   assert_eq!(r.open(scope).integer_value(scope), Some(10));
@@ -207,7 +207,7 @@ fn test_op_disabled() {
   });
   // Disabled op should be replaced with a function that throws.
   let err = runtime
-    .execute_script_static("test.js", "Deno.core.ops.op_foo()")
+    .execute_script("test.js", "Deno.core.ops.op_foo()")
     .unwrap_err();
   assert!(err.to_string().contains("op is disabled"));
 }
@@ -234,7 +234,7 @@ fn test_op_detached_buffer() {
   });
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "test.js",
       r#"
       const a1 = new Uint8Array([1,2,3]);
@@ -266,7 +266,7 @@ fn test_op_detached_buffer() {
     .unwrap();
 
   runtime
-    .execute_script_static(
+    .execute_script(
       "test.js",
       r#"
       const wmem = new WebAssembly.Memory({ initial: 1, maximum: 2 });
@@ -349,14 +349,14 @@ fn ops_in_js_have_proper_names() {
     throw new Error();
   }
   "#;
-  runtime.execute_script_static("test", src).unwrap();
+  runtime.execute_script("test", src).unwrap();
 }
 
 #[tokio::test]
 async fn test_ref_unref_ops() {
   let (mut runtime, _dispatch_count) = setup(Mode::AsyncDeferred);
   runtime
-    .execute_script_static(
+    .execute_script(
       "filename.js",
       r#"
       const { op_test } = Deno.core.ensureFastOps();
@@ -371,7 +371,7 @@ async fn test_ref_unref_ops() {
     assert_eq!(realm.num_unrefed_ops(), 0);
   }
   runtime
-    .execute_script_static(
+    .execute_script(
       "filename.js",
       r#"
       Deno.core.unrefOpPromise(p1);
@@ -385,7 +385,7 @@ async fn test_ref_unref_ops() {
     assert_eq!(realm.num_unrefed_ops(), 2);
   }
   runtime
-    .execute_script_static(
+    .execute_script(
       "filename.js",
       r#"
       Deno.core.refOpPromise(p1);
@@ -404,7 +404,7 @@ async fn test_ref_unref_ops() {
 fn test_dispatch() {
   let (mut runtime, dispatch_count) = setup(Mode::Async);
   runtime
-    .execute_script_static(
+    .execute_script(
       "filename.js",
       r#"
       let control = 42;
@@ -424,7 +424,7 @@ fn test_dispatch() {
 fn test_dispatch_no_zero_copy_buf() {
   let (mut runtime, dispatch_count) = setup(Mode::AsyncZeroCopy(false));
   runtime
-    .execute_script_static(
+    .execute_script(
       "filename.js",
       r#"
       const { op_test } = Deno.core.ensureFastOps();
@@ -439,7 +439,7 @@ fn test_dispatch_no_zero_copy_buf() {
 fn test_dispatch_stack_zero_copy_bufs() {
   let (mut runtime, dispatch_count) = setup(Mode::AsyncZeroCopy(true));
   runtime
-    .execute_script_static(
+    .execute_script(
       "filename.js",
       r#"
       const { op_test } = Deno.core.ensureFastOps();
@@ -455,7 +455,7 @@ fn test_dispatch_stack_zero_copy_bufs() {
 fn test_call_site() {
   let (mut runtime, _) = setup(Mode::Async);
   runtime
-    .execute_script_static(
+    .execute_script(
       "file:///filename.js",
       r#"
       const cs = Deno.core.currentUserCallSite();
@@ -634,7 +634,7 @@ pub async fn test_op_metrics() {
   });
 
   let promise = runtime
-  .execute_script_static(
+  .execute_script(
     "filename.js",
     r#"
     const { op_sync, op_sync_error, op_async, op_async_error, op_async_yield, op_async_yield_error, op_async_deferred, op_async_lazy, op_async_impl_future_error, op_sync_arg_error, op_async_arg_error } = Deno.core.ensureFastOps();
@@ -706,7 +706,7 @@ pub async fn test_op_metrics_summary_tracker() {
   });
 
   let promise = runtime
-  .execute_script_static(
+  .execute_script(
     "filename.js",
     r#"
     const { op_sync, op_sync_error, op_async, op_async_error, op_async_yield, op_async_yield_error, op_async_deferred, op_async_lazy, op_async_impl_future_error, op_sync_arg_error, op_async_arg_error } = Deno.core.ensureFastOps();
diff --git a/core/runtime/tests/snapshot.rs b/core/runtime/tests/snapshot.rs
index dd99271..efeb765 100644
--- a/core/runtime/tests/snapshot.rs
+++ b/core/runtime/tests/snapshot.rs
@@ -16,7 +16,7 @@ use self::runtime::CreateSnapshotOptions;
 fn will_snapshot() {
   let snapshot = {
     let mut runtime = JsRuntimeForSnapshot::new(Default::default());
-    runtime.execute_script_static("a.js", "a = 1 + 2").unwrap();
+    runtime.execute_script("a.js", "a = 1 + 2").unwrap();
     runtime.snapshot()
   };
 
@@ -26,7 +26,7 @@ fn will_snapshot() {
     ..Default::default()
   });
   runtime2
-    .execute_script_static("check.js", "if (a != 3) throw Error('x')")
+    .execute_script("check.js", "if (a != 3) throw Error('x')")
     .unwrap();
 }
 
@@ -34,9 +34,7 @@ fn will_snapshot() {
 fn will_snapshot2() {
   let startup_data = {
     let mut runtime = JsRuntimeForSnapshot::new(Default::default());
-    runtime
-      .execute_script_static("a.js", "let a = 1 + 2")
-      .unwrap();
+    runtime.execute_script("a.js", "let a = 1 + 2").unwrap();
     runtime.snapshot()
   };
 
@@ -48,9 +46,9 @@ fn will_snapshot2() {
 
   let startup_data = {
     runtime
-      .execute_script_static("check_a.js", "if (a != 3) throw Error('x')")
+      .execute_script("check_a.js", "if (a != 3) throw Error('x')")
       .unwrap();
-    runtime.execute_script_static("b.js", "b = 2 + 3").unwrap();
+    runtime.execute_script("b.js", "b = 2 + 3").unwrap();
     runtime.snapshot()
   };
 
@@ -61,10 +59,10 @@ fn will_snapshot2() {
       ..Default::default()
     });
     runtime
-      .execute_script_static("check_b.js", "if (b != 5) throw Error('x')")
+      .execute_script("check_b.js", "if (b != 5) throw Error('x')")
       .unwrap();
     runtime
-      .execute_script_static("check2.js", "if (!Deno.core) throw Error('x')")
+      .execute_script("check2.js", "if (!Deno.core) throw Error('x')")
       .unwrap();
   }
 }
@@ -74,7 +72,7 @@ fn test_snapshot_callbacks() {
   let snapshot = {
     let mut runtime = JsRuntimeForSnapshot::new(Default::default());
     runtime
-      .execute_script_static(
+      .execute_script(
         "a.js",
         r#"
         Deno.core.setMacrotaskCallback(() => {
@@ -99,7 +97,7 @@ fn test_snapshot_callbacks() {
     ..Default::default()
   });
   runtime2
-    .execute_script_static("check.js", "if (a != 3) throw Error('x')")
+    .execute_script("check.js", "if (a != 3) throw Error('x')")
     .unwrap();
 }
 
@@ -107,7 +105,7 @@ fn test_snapshot_callbacks() {
 fn test_from_snapshot() {
   let snapshot = {
     let mut runtime = JsRuntimeForSnapshot::new(Default::default());
-    runtime.execute_script_static("a.js", "a = 1 + 2").unwrap();
+    runtime.execute_script("a.js", "a = 1 + 2").unwrap();
     runtime.snapshot()
   };
 
@@ -117,7 +115,7 @@ fn test_from_snapshot() {
     ..Default::default()
   });
   runtime2
-    .execute_script_static("check.js", "if (a != 3) throw Error('x')")
+    .execute_script("check.js", "if (a != 3) throw Error('x')")
     .unwrap();
 }
 
@@ -131,7 +129,7 @@ fn test_snapshot_creator() {
       skip_op_registration: false,
       extensions: vec![],
       with_runtime_cb: Some(Box::new(|runtime| {
-        runtime.execute_script_static("a.js", "a = 1 + 2").unwrap();
+        runtime.execute_script("a.js", "a = 1 + 2").unwrap();
       })),
     },
     None,
@@ -145,7 +143,7 @@ fn test_snapshot_creator() {
     ..Default::default()
   });
   runtime2
-    .execute_script_static("check.js", "if (a != 3) throw Error('x')")
+    .execute_script("check.js", "if (a != 3) throw Error('x')")
     .unwrap();
 }
 
@@ -163,7 +161,7 @@ fn test_snapshot_creator_warmup() {
       with_runtime_cb: Some(Box::new(move |runtime| {
         c.replace_with(|&mut c| c + 1);
 
-        runtime.execute_script_static("a.js", "a = 1 + 2").unwrap();
+        runtime.execute_script("a.js", "a = 1 + 2").unwrap();
       })),
     },
     Some("const b = 'Hello'"),
@@ -181,7 +179,7 @@ fn test_snapshot_creator_warmup() {
     ..Default::default()
   });
   runtime2
-    .execute_script_static("check.js", "if (a != 3) throw Error('x')")
+    .execute_script("check.js", "if (a != 3) throw Error('x')")
     .unwrap();
 }
 
@@ -312,7 +310,7 @@ fn es_snapshot() {
     const mod = await import("file:///400.js");
     return mod.f400() + " " + Deno.core.ops.op_test();
   })();"#;
-  let val = runtime3.execute_script_static(".", source_code).unwrap();
+  let val = runtime3.execute_script(".", source_code).unwrap();
   #[allow(deprecated)]
   let val = futures::executor::block_on(runtime3.resolve_value(val)).unwrap();
   {
@@ -363,7 +361,7 @@ pub(crate) fn es_snapshot_without_runtime_module_loader() {
 
   // Dynamic imports of ext: from non-ext: modules are not allowed.
   let dyn_import_promise = realm
-    .execute_script_static(
+    .execute_script(
       runtime.v8_isolate(),
       "",
       "import('ext:module_snapshot/test.js')",
@@ -379,7 +377,7 @@ pub(crate) fn es_snapshot_without_runtime_module_loader() {
 
   // But not a new one
   let dyn_import_promise = realm
-    .execute_script_static(
+    .execute_script(
       runtime.v8_isolate(),
       "",
       "import('ext:module_snapshot/test2.js')",
diff --git a/ops/op2/test_cases/async/async_arg_return.out b/ops/op2/test_cases/async/async_arg_return.out
index 3edad7a..433067d 100644
--- a/ops/op2/test_cases/async/async_arg_return.out
+++ b/ops/op2/test_cases/async/async_arg_return.out
@@ -2,10 +2,10 @@
 pub struct op_async {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async {
+impl ::deno_core::_ops::Op for op_async {
     const NAME: &'static str = stringify!(op_async);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async),
         true,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/async/async_arg_return_result.out b/ops/op2/test_cases/async/async_arg_return_result.out
index 5f78461..a011c7e 100644
--- a/ops/op2/test_cases/async/async_arg_return_result.out
+++ b/ops/op2/test_cases/async/async_arg_return_result.out
@@ -2,10 +2,10 @@
 pub struct op_async {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async {
+impl ::deno_core::_ops::Op for op_async {
     const NAME: &'static str = stringify!(op_async);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async),
         true,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/async/async_deferred.out b/ops/op2/test_cases/async/async_deferred.out
index 0f7c703..f69f5df 100644
--- a/ops/op2/test_cases/async/async_deferred.out
+++ b/ops/op2/test_cases/async/async_deferred.out
@@ -2,10 +2,10 @@
 pub struct op_async_deferred {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async_deferred {
+impl ::deno_core::_ops::Op for op_async_deferred {
     const NAME: &'static str = stringify!(op_async_deferred);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async_deferred),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async_deferred),
         true,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/async/async_jsbuffer.out b/ops/op2/test_cases/async/async_jsbuffer.out
index 67bd92b..d793c90 100644
--- a/ops/op2/test_cases/async/async_jsbuffer.out
+++ b/ops/op2/test_cases/async/async_jsbuffer.out
@@ -2,10 +2,10 @@
 pub struct op_async_v8_buffer {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async_v8_buffer {
+impl ::deno_core::_ops::Op for op_async_v8_buffer {
     const NAME: &'static str = stringify!(op_async_v8_buffer);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async_v8_buffer),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async_v8_buffer),
         true,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/async/async_lazy.out b/ops/op2/test_cases/async/async_lazy.out
index ea1174b..af977a0 100644
--- a/ops/op2/test_cases/async/async_lazy.out
+++ b/ops/op2/test_cases/async/async_lazy.out
@@ -2,10 +2,10 @@
 pub struct op_async_lazy {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async_lazy {
+impl ::deno_core::_ops::Op for op_async_lazy {
     const NAME: &'static str = stringify!(op_async_lazy);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async_lazy),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async_lazy),
         true,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/async/async_opstate.out b/ops/op2/test_cases/async/async_opstate.out
index 8ad7ffb..c625106 100644
--- a/ops/op2/test_cases/async/async_opstate.out
+++ b/ops/op2/test_cases/async/async_opstate.out
@@ -2,10 +2,10 @@
 pub struct op_async_opstate {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async_opstate {
+impl ::deno_core::_ops::Op for op_async_opstate {
     const NAME: &'static str = stringify!(op_async_opstate);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async_opstate),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async_opstate),
         true,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/async/async_result.out b/ops/op2/test_cases/async/async_result.out
index a490a9b..83988b3 100644
--- a/ops/op2/test_cases/async/async_result.out
+++ b/ops/op2/test_cases/async/async_result.out
@@ -2,10 +2,10 @@
 pub struct op_async {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async {
+impl ::deno_core::_ops::Op for op_async {
     const NAME: &'static str = stringify!(op_async);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async),
         true,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/async/async_result_impl.out b/ops/op2/test_cases/async/async_result_impl.out
index 9991173..15a60a9 100644
--- a/ops/op2/test_cases/async/async_result_impl.out
+++ b/ops/op2/test_cases/async/async_result_impl.out
@@ -2,10 +2,10 @@
 pub struct op_async_result_impl {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async_result_impl {
+impl ::deno_core::_ops::Op for op_async_result_impl {
     const NAME: &'static str = stringify!(op_async_result_impl);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async_result_impl),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async_result_impl),
         true,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/async/async_result_smi.out b/ops/op2/test_cases/async/async_result_smi.out
index 9ff61e3..8dd0c09 100644
--- a/ops/op2/test_cases/async/async_result_smi.out
+++ b/ops/op2/test_cases/async/async_result_smi.out
@@ -2,10 +2,10 @@
 pub struct op_async {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async {
+impl ::deno_core::_ops::Op for op_async {
     const NAME: &'static str = stringify!(op_async);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async),
         true,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/async/async_v8_global.out b/ops/op2/test_cases/async/async_v8_global.out
index 6c2e7af..f8aa6f1 100644
--- a/ops/op2/test_cases/async/async_v8_global.out
+++ b/ops/op2/test_cases/async/async_v8_global.out
@@ -2,10 +2,10 @@
 pub struct op_async_v8_global {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async_v8_global {
+impl ::deno_core::_ops::Op for op_async_v8_global {
     const NAME: &'static str = stringify!(op_async_v8_global);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async_v8_global),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async_v8_global),
         true,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/async/async_void.out b/ops/op2/test_cases/async/async_void.out
index cd29d21..8f4a9ab 100644
--- a/ops/op2/test_cases/async/async_void.out
+++ b/ops/op2/test_cases/async/async_void.out
@@ -2,10 +2,10 @@
 pub struct op_async {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_async {
+impl ::deno_core::_ops::Op for op_async {
     const NAME: &'static str = stringify!(op_async);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_async),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_async),
         true,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/add.out b/ops/op2/test_cases/sync/add.out
index 54e9cdc..c3e6c86 100644
--- a/ops/op2/test_cases/sync/add.out
+++ b/ops/op2/test_cases/sync/add.out
@@ -2,10 +2,10 @@
 struct op_add {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_add {
+impl ::deno_core::_ops::Op for op_add {
     const NAME: &'static str = stringify!(op_add);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_add),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_add),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/add_options.out b/ops/op2/test_cases/sync/add_options.out
index 19ec8b2..ba0beeb 100644
--- a/ops/op2/test_cases/sync/add_options.out
+++ b/ops/op2/test_cases/sync/add_options.out
@@ -2,10 +2,10 @@
 pub struct op_test_add_option {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_test_add_option {
+impl ::deno_core::_ops::Op for op_test_add_option {
     const NAME: &'static str = stringify!(op_test_add_option);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_test_add_option),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_test_add_option),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/bigint.out b/ops/op2/test_cases/sync/bigint.out
index 47d6d56..a5c7af5 100644
--- a/ops/op2/test_cases/sync/bigint.out
+++ b/ops/op2/test_cases/sync/bigint.out
@@ -2,10 +2,10 @@
 pub struct op_bigint {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_bigint {
+impl ::deno_core::_ops::Op for op_bigint {
     const NAME: &'static str = stringify!(op_bigint);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_bigint),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_bigint),
         false,
         false,
         0usize as u8,
diff --git a/ops/op2/test_cases/sync/bool.out b/ops/op2/test_cases/sync/bool.out
index 203f1f8..968e810 100644
--- a/ops/op2/test_cases/sync/bool.out
+++ b/ops/op2/test_cases/sync/bool.out
@@ -2,10 +2,10 @@
 pub struct op_bool {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_bool {
+impl ::deno_core::_ops::Op for op_bool {
     const NAME: &'static str = stringify!(op_bool);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_bool),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_bool),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/bool_result.out b/ops/op2/test_cases/sync/bool_result.out
index cd73aa9..183e667 100644
--- a/ops/op2/test_cases/sync/bool_result.out
+++ b/ops/op2/test_cases/sync/bool_result.out
@@ -2,10 +2,10 @@
 pub struct op_bool {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_bool {
+impl ::deno_core::_ops::Op for op_bool {
     const NAME: &'static str = stringify!(op_bool);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_bool),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_bool),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/buffers.out b/ops/op2/test_cases/sync/buffers.out
index 9f45eb1..975f02d 100644
--- a/ops/op2/test_cases/sync/buffers.out
+++ b/ops/op2/test_cases/sync/buffers.out
@@ -2,10 +2,10 @@
 struct op_buffers {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_buffers {
+impl ::deno_core::_ops::Op for op_buffers {
     const NAME: &'static str = stringify!(op_buffers);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_buffers),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_buffers),
         false,
         false,
         4usize as u8,
@@ -266,10 +266,10 @@ impl op_buffers {
 struct op_buffers_32 {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_buffers_32 {
+impl ::deno_core::_ops::Op for op_buffers_32 {
     const NAME: &'static str = stringify!(op_buffers_32);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_buffers_32),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_buffers_32),
         false,
         false,
         4usize as u8,
@@ -530,10 +530,10 @@ impl op_buffers_32 {
 struct op_buffers_option {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_buffers_option {
+impl ::deno_core::_ops::Op for op_buffers_option {
     const NAME: &'static str = stringify!(op_buffers_option);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_buffers_option),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_buffers_option),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/buffers_copy.out b/ops/op2/test_cases/sync/buffers_copy.out
index 5a78f2f..ee72d4a 100644
--- a/ops/op2/test_cases/sync/buffers_copy.out
+++ b/ops/op2/test_cases/sync/buffers_copy.out
@@ -2,10 +2,10 @@
 struct op_buffers {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_buffers {
+impl ::deno_core::_ops::Op for op_buffers {
     const NAME: &'static str = stringify!(op_buffers);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_buffers),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_buffers),
         false,
         false,
         3usize as u8,
@@ -221,10 +221,10 @@ impl op_buffers {
 struct op_buffers_32 {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_buffers_32 {
+impl ::deno_core::_ops::Op for op_buffers_32 {
     const NAME: &'static str = stringify!(op_buffers_32);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_buffers_32),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_buffers_32),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/buffers_out.out b/ops/op2/test_cases/sync/buffers_out.out
index c67dc33..8d304f7 100644
--- a/ops/op2/test_cases/sync/buffers_out.out
+++ b/ops/op2/test_cases/sync/buffers_out.out
@@ -2,10 +2,10 @@
 struct op_buffers {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_buffers {
+impl ::deno_core::_ops::Op for op_buffers {
     const NAME: &'static str = stringify!(op_buffers);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_buffers),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_buffers),
         false,
         false,
         1usize as u8,
@@ -110,10 +110,10 @@ impl op_buffers {
 struct op_buffers_option {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_buffers_option {
+impl ::deno_core::_ops::Op for op_buffers_option {
     const NAME: &'static str = stringify!(op_buffers_option);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_buffers_option),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_buffers_option),
         false,
         false,
         1usize as u8,
@@ -225,10 +225,10 @@ impl op_buffers_option {
 struct op_arraybuffers {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_arraybuffers {
+impl ::deno_core::_ops::Op for op_arraybuffers {
     const NAME: &'static str = stringify!(op_arraybuffers);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_arraybuffers),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_arraybuffers),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/cfg.out b/ops/op2/test_cases/sync/cfg.out
index 0fed2e9..a3f23db 100644
--- a/ops/op2/test_cases/sync/cfg.out
+++ b/ops/op2/test_cases/sync/cfg.out
@@ -4,10 +4,10 @@
 pub struct op_maybe_windows {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_maybe_windows {
+impl ::deno_core::_ops::Op for op_maybe_windows {
     const NAME: &'static str = stringify!(op_maybe_windows);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_maybe_windows),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_maybe_windows),
         false,
         false,
         0usize as u8,
@@ -126,10 +126,10 @@ impl op_maybe_windows {
 pub struct op_maybe_windows {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_maybe_windows {
+impl ::deno_core::_ops::Op for op_maybe_windows {
     const NAME: &'static str = stringify!(op_maybe_windows);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_maybe_windows),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_maybe_windows),
         false,
         false,
         0usize as u8,
diff --git a/ops/op2/test_cases/sync/clippy_allow.out b/ops/op2/test_cases/sync/clippy_allow.out
index a4ca2f3..800dc76 100644
--- a/ops/op2/test_cases/sync/clippy_allow.out
+++ b/ops/op2/test_cases/sync/clippy_allow.out
@@ -4,10 +4,10 @@
 pub struct op_extra_annotation {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_extra_annotation {
+impl ::deno_core::_ops::Op for op_extra_annotation {
     const NAME: &'static str = stringify!(op_extra_annotation);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_extra_annotation),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_extra_annotation),
         false,
         false,
         0usize as u8,
@@ -124,10 +124,10 @@ impl op_extra_annotation {
 pub struct op_clippy_internal {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_clippy_internal {
+impl ::deno_core::_ops::Op for op_clippy_internal {
     const NAME: &'static str = stringify!(op_clippy_internal);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_clippy_internal),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_clippy_internal),
         false,
         false,
         0usize as u8,
diff --git a/ops/op2/test_cases/sync/cppgc_resource.out b/ops/op2/test_cases/sync/cppgc_resource.out
index 0f12015..26dd02f 100644
--- a/ops/op2/test_cases/sync/cppgc_resource.out
+++ b/ops/op2/test_cases/sync/cppgc_resource.out
@@ -2,10 +2,10 @@
 struct op_file {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_file {
+impl ::deno_core::_ops::Op for op_file {
     const NAME: &'static str = stringify!(op_file);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_file),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_file),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/doc_comment.out b/ops/op2/test_cases/sync/doc_comment.out
index e2ea1a1..fa69916 100644
--- a/ops/op2/test_cases/sync/doc_comment.out
+++ b/ops/op2/test_cases/sync/doc_comment.out
@@ -3,10 +3,10 @@
 pub struct op_has_doc_comment {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_has_doc_comment {
+impl ::deno_core::_ops::Op for op_has_doc_comment {
     const NAME: &'static str = stringify!(op_has_doc_comment);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_has_doc_comment),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_has_doc_comment),
         false,
         false,
         0usize as u8,
diff --git a/ops/op2/test_cases/sync/fast_alternative.out b/ops/op2/test_cases/sync/fast_alternative.out
index 35faefa..a7df59b 100644
--- a/ops/op2/test_cases/sync/fast_alternative.out
+++ b/ops/op2/test_cases/sync/fast_alternative.out
@@ -2,10 +2,10 @@
 struct op_slow {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_slow {
+impl ::deno_core::_ops::Op for op_slow {
     const NAME: &'static str = stringify!(op_slow);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_slow),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_slow),
         false,
         false,
         3usize as u8,
@@ -107,10 +107,10 @@ impl op_slow {
 struct op_fast {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_fast {
+impl ::deno_core::_ops::Op for op_fast {
     const NAME: &'static str = stringify!(op_fast);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_fast),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_fast),
         false,
         false,
         2usize as u8,
@@ -270,10 +270,10 @@ impl op_fast {
 struct op_slow_generic<T> {
     _unconstructable: ::std::marker::PhantomData<(T)>,
 }
-impl<T: Trait> deno_core::_ops::Op for op_slow_generic<T> {
+impl<T: Trait> ::deno_core::_ops::Op for op_slow_generic<T> {
     const NAME: &'static str = stringify!(op_slow_generic);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_slow_generic),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_slow_generic),
         false,
         false,
         3usize as u8,
@@ -375,10 +375,10 @@ impl<T: Trait> op_slow_generic<T> {
 struct op_fast_generic<T> {
     _unconstructable: ::std::marker::PhantomData<(T)>,
 }
-impl<T: Trait> deno_core::_ops::Op for op_fast_generic<T> {
+impl<T: Trait> ::deno_core::_ops::Op for op_fast_generic<T> {
     const NAME: &'static str = stringify!(op_fast_generic);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_fast_generic),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_fast_generic),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/generics.out b/ops/op2/test_cases/sync/generics.out
index 9db629c..bb11fc3 100644
--- a/ops/op2/test_cases/sync/generics.out
+++ b/ops/op2/test_cases/sync/generics.out
@@ -2,10 +2,10 @@
 pub struct op_generics<T> {
     _unconstructable: ::std::marker::PhantomData<(T)>,
 }
-impl<T: Trait> deno_core::_ops::Op for op_generics<T> {
+impl<T: Trait> ::deno_core::_ops::Op for op_generics<T> {
     const NAME: &'static str = stringify!(op_generics);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_generics),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_generics),
         false,
         false,
         0usize as u8,
@@ -120,10 +120,10 @@ impl<T: Trait> op_generics<T> {
 pub struct op_generics_static<T> {
     _unconstructable: ::std::marker::PhantomData<(T)>,
 }
-impl<T: Trait + 'static> deno_core::_ops::Op for op_generics_static<T> {
+impl<T: Trait + 'static> ::deno_core::_ops::Op for op_generics_static<T> {
     const NAME: &'static str = stringify!(op_generics_static);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_generics_static),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_generics_static),
         false,
         false,
         0usize as u8,
@@ -238,10 +238,10 @@ impl<T: Trait + 'static> op_generics_static<T> {
 pub struct op_generics_static_where<T> {
     _unconstructable: ::std::marker::PhantomData<(T)>,
 }
-impl<T: Trait + 'static> deno_core::_ops::Op for op_generics_static_where<T> {
+impl<T: Trait + 'static> ::deno_core::_ops::Op for op_generics_static_where<T> {
     const NAME: &'static str = stringify!(op_generics_static_where);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_generics_static_where),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_generics_static_where),
         false,
         false,
         0usize as u8,
diff --git a/ops/op2/test_cases/sync/nofast.out b/ops/op2/test_cases/sync/nofast.out
index 156956d..3b99c08 100644
--- a/ops/op2/test_cases/sync/nofast.out
+++ b/ops/op2/test_cases/sync/nofast.out
@@ -2,10 +2,10 @@
 struct op_nofast {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_nofast {
+impl ::deno_core::_ops::Op for op_nofast {
     const NAME: &'static str = stringify!(op_nofast);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_nofast),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_nofast),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/op_state_attr.out b/ops/op2/test_cases/sync/op_state_attr.out
index c84ff96..1067d64 100644
--- a/ops/op2/test_cases/sync/op_state_attr.out
+++ b/ops/op2/test_cases/sync/op_state_attr.out
@@ -2,10 +2,10 @@
 struct op_state_rc {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_state_rc {
+impl ::deno_core::_ops::Op for op_state_rc {
     const NAME: &'static str = stringify!(op_state_rc);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_state_rc),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_state_rc),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/op_state_rc.out b/ops/op2/test_cases/sync/op_state_rc.out
index 63ac500..f4c8b4a 100644
--- a/ops/op2/test_cases/sync/op_state_rc.out
+++ b/ops/op2/test_cases/sync/op_state_rc.out
@@ -2,10 +2,10 @@
 struct op_state_rc {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_state_rc {
+impl ::deno_core::_ops::Op for op_state_rc {
     const NAME: &'static str = stringify!(op_state_rc);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_state_rc),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_state_rc),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/op_state_ref.out b/ops/op2/test_cases/sync/op_state_ref.out
index 716c935..f9b1f13 100644
--- a/ops/op2/test_cases/sync/op_state_ref.out
+++ b/ops/op2/test_cases/sync/op_state_ref.out
@@ -2,10 +2,10 @@
 struct op_state_ref {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_state_ref {
+impl ::deno_core::_ops::Op for op_state_ref {
     const NAME: &'static str = stringify!(op_state_ref);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_state_ref),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_state_ref),
         false,
         false,
         1usize as u8,
@@ -144,10 +144,10 @@ impl op_state_ref {
 struct op_state_mut {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_state_mut {
+impl ::deno_core::_ops::Op for op_state_mut {
     const NAME: &'static str = stringify!(op_state_mut);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_state_mut),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_state_mut),
         false,
         false,
         1usize as u8,
@@ -286,10 +286,10 @@ impl op_state_mut {
 struct op_state_and_v8 {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_state_and_v8 {
+impl ::deno_core::_ops::Op for op_state_and_v8 {
     const NAME: &'static str = stringify!(op_state_and_v8);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_state_and_v8),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_state_and_v8),
         false,
         false,
         2usize as u8,
@@ -384,10 +384,10 @@ impl op_state_and_v8 {
 struct op_state_and_v8_local {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_state_and_v8_local {
+impl ::deno_core::_ops::Op for op_state_and_v8_local {
     const NAME: &'static str = stringify!(op_state_and_v8_local);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_state_and_v8_local),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_state_and_v8_local),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/result_external.out b/ops/op2/test_cases/sync/result_external.out
index 6111daf..7169b60 100644
--- a/ops/op2/test_cases/sync/result_external.out
+++ b/ops/op2/test_cases/sync/result_external.out
@@ -2,10 +2,10 @@
 pub struct op_external_with_result {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_external_with_result {
+impl ::deno_core::_ops::Op for op_external_with_result {
     const NAME: &'static str = stringify!(op_external_with_result);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_external_with_result),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_external_with_result),
         false,
         false,
         0usize as u8,
diff --git a/ops/op2/test_cases/sync/result_primitive.out b/ops/op2/test_cases/sync/result_primitive.out
index 650d587..174b6d2 100644
--- a/ops/op2/test_cases/sync/result_primitive.out
+++ b/ops/op2/test_cases/sync/result_primitive.out
@@ -2,10 +2,10 @@
 pub struct op_u32_with_result {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_u32_with_result {
+impl ::deno_core::_ops::Op for op_u32_with_result {
     const NAME: &'static str = stringify!(op_u32_with_result);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_u32_with_result),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_u32_with_result),
         false,
         false,
         0usize as u8,
diff --git a/ops/op2/test_cases/sync/result_scope.out b/ops/op2/test_cases/sync/result_scope.out
index 2ae891c..4ff0261 100644
--- a/ops/op2/test_cases/sync/result_scope.out
+++ b/ops/op2/test_cases/sync/result_scope.out
@@ -2,10 +2,10 @@
 pub struct op_void_with_result {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_void_with_result {
+impl ::deno_core::_ops::Op for op_void_with_result {
     const NAME: &'static str = stringify!(op_void_with_result);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_void_with_result),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_void_with_result),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/result_void.out b/ops/op2/test_cases/sync/result_void.out
index a8a19a2..2ccccb0 100644
--- a/ops/op2/test_cases/sync/result_void.out
+++ b/ops/op2/test_cases/sync/result_void.out
@@ -2,10 +2,10 @@
 pub struct op_void_with_result {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_void_with_result {
+impl ::deno_core::_ops::Op for op_void_with_result {
     const NAME: &'static str = stringify!(op_void_with_result);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_void_with_result),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_void_with_result),
         false,
         false,
         0usize as u8,
diff --git a/ops/op2/test_cases/sync/serde_v8.out b/ops/op2/test_cases/sync/serde_v8.out
index 77ad73c..2f935b8 100644
--- a/ops/op2/test_cases/sync/serde_v8.out
+++ b/ops/op2/test_cases/sync/serde_v8.out
@@ -2,10 +2,10 @@
 pub struct op_serde_v8 {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_serde_v8 {
+impl ::deno_core::_ops::Op for op_serde_v8 {
     const NAME: &'static str = stringify!(op_serde_v8);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_serde_v8),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_serde_v8),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/smi.out b/ops/op2/test_cases/sync/smi.out
index dcda352..2098c75 100644
--- a/ops/op2/test_cases/sync/smi.out
+++ b/ops/op2/test_cases/sync/smi.out
@@ -2,10 +2,10 @@
 struct op_smi_unsigned_return {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_smi_unsigned_return {
+impl ::deno_core::_ops::Op for op_smi_unsigned_return {
     const NAME: &'static str = stringify!(op_smi_unsigned_return);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_smi_unsigned_return),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_smi_unsigned_return),
         false,
         false,
         4usize as u8,
@@ -212,10 +212,10 @@ impl op_smi_unsigned_return {
 struct op_smi_signed_return {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_smi_signed_return {
+impl ::deno_core::_ops::Op for op_smi_signed_return {
     const NAME: &'static str = stringify!(op_smi_signed_return);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_smi_signed_return),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_smi_signed_return),
         false,
         false,
         4usize as u8,
@@ -422,10 +422,10 @@ impl op_smi_signed_return {
 struct op_smi_option {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_smi_option {
+impl ::deno_core::_ops::Op for op_smi_option {
     const NAME: &'static str = stringify!(op_smi_option);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_smi_option),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_smi_option),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/string_cow.out b/ops/op2/test_cases/sync/string_cow.out
index 2799ecc..726ca36 100644
--- a/ops/op2/test_cases/sync/string_cow.out
+++ b/ops/op2/test_cases/sync/string_cow.out
@@ -2,10 +2,10 @@
 struct op_string_cow {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_string_cow {
+impl ::deno_core::_ops::Op for op_string_cow {
     const NAME: &'static str = stringify!(op_string_cow);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_string_cow),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_string_cow),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/string_onebyte.out b/ops/op2/test_cases/sync/string_onebyte.out
index 12e3a4f..e69ac11 100644
--- a/ops/op2/test_cases/sync/string_onebyte.out
+++ b/ops/op2/test_cases/sync/string_onebyte.out
@@ -2,10 +2,10 @@
 struct op_string_onebyte {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_string_onebyte {
+impl ::deno_core::_ops::Op for op_string_onebyte {
     const NAME: &'static str = stringify!(op_string_onebyte);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_string_onebyte),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_string_onebyte),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/string_option_return.out b/ops/op2/test_cases/sync/string_option_return.out
index 0777463..13fbffa 100644
--- a/ops/op2/test_cases/sync/string_option_return.out
+++ b/ops/op2/test_cases/sync/string_option_return.out
@@ -2,10 +2,10 @@
 pub struct op_string_return {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_string_return {
+impl ::deno_core::_ops::Op for op_string_return {
     const NAME: &'static str = stringify!(op_string_return);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_string_return),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_string_return),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/string_owned.out b/ops/op2/test_cases/sync/string_owned.out
index e3cb0db..d24caf0 100644
--- a/ops/op2/test_cases/sync/string_owned.out
+++ b/ops/op2/test_cases/sync/string_owned.out
@@ -2,10 +2,10 @@
 struct op_string_owned {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_string_owned {
+impl ::deno_core::_ops::Op for op_string_owned {
     const NAME: &'static str = stringify!(op_string_owned);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_string_owned),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_string_owned),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/string_ref.out b/ops/op2/test_cases/sync/string_ref.out
index 88f6a03..b266b01 100644
--- a/ops/op2/test_cases/sync/string_ref.out
+++ b/ops/op2/test_cases/sync/string_ref.out
@@ -2,10 +2,10 @@
 struct op_string_owned {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_string_owned {
+impl ::deno_core::_ops::Op for op_string_owned {
     const NAME: &'static str = stringify!(op_string_owned);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_string_owned),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_string_owned),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/string_return.out b/ops/op2/test_cases/sync/string_return.out
index d05e240..05a5b01 100644
--- a/ops/op2/test_cases/sync/string_return.out
+++ b/ops/op2/test_cases/sync/string_return.out
@@ -2,10 +2,10 @@
 pub struct op_string_return {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_string_return {
+impl ::deno_core::_ops::Op for op_string_return {
     const NAME: &'static str = stringify!(op_string_return);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_string_return),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_string_return),
         false,
         false,
         0usize as u8,
@@ -87,10 +87,10 @@ impl op_string_return {
 pub struct op_string_return_ref {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_string_return_ref {
+impl ::deno_core::_ops::Op for op_string_return_ref {
     const NAME: &'static str = stringify!(op_string_return_ref);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_string_return_ref),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_string_return_ref),
         false,
         false,
         0usize as u8,
@@ -172,10 +172,10 @@ impl op_string_return_ref {
 pub struct op_string_return_cow {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_string_return_cow {
+impl ::deno_core::_ops::Op for op_string_return_cow {
     const NAME: &'static str = stringify!(op_string_return_cow);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_string_return_cow),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_string_return_cow),
         false,
         false,
         0usize as u8,
diff --git a/ops/op2/test_cases/sync/v8_global.out b/ops/op2/test_cases/sync/v8_global.out
index f27e75a..b144046 100644
--- a/ops/op2/test_cases/sync/v8_global.out
+++ b/ops/op2/test_cases/sync/v8_global.out
@@ -2,10 +2,10 @@
 pub struct op_global {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_global {
+impl ::deno_core::_ops::Op for op_global {
     const NAME: &'static str = stringify!(op_global);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_global),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_global),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/v8_handlescope.out b/ops/op2/test_cases/sync/v8_handlescope.out
index 9eeebc6..a16f4d9 100644
--- a/ops/op2/test_cases/sync/v8_handlescope.out
+++ b/ops/op2/test_cases/sync/v8_handlescope.out
@@ -2,10 +2,10 @@
 struct op_handlescope {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_handlescope {
+impl ::deno_core::_ops::Op for op_handlescope {
     const NAME: &'static str = stringify!(op_handlescope);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_handlescope),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_handlescope),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/v8_lifetime.out b/ops/op2/test_cases/sync/v8_lifetime.out
index ed886e6..7a0ab6c 100644
--- a/ops/op2/test_cases/sync/v8_lifetime.out
+++ b/ops/op2/test_cases/sync/v8_lifetime.out
@@ -2,10 +2,10 @@
 pub struct op_v8_lifetime {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_v8_lifetime {
+impl ::deno_core::_ops::Op for op_v8_lifetime {
     const NAME: &'static str = stringify!(op_v8_lifetime);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_v8_lifetime),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_v8_lifetime),
         false,
         false,
         1usize as u8,
diff --git a/ops/op2/test_cases/sync/v8_ref_option.out b/ops/op2/test_cases/sync/v8_ref_option.out
index 9ffa202..0478fff 100644
--- a/ops/op2/test_cases/sync/v8_ref_option.out
+++ b/ops/op2/test_cases/sync/v8_ref_option.out
@@ -2,10 +2,10 @@
 pub struct op_v8_lifetime {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_v8_lifetime {
+impl ::deno_core::_ops::Op for op_v8_lifetime {
     const NAME: &'static str = stringify!(op_v8_lifetime);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_v8_lifetime),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_v8_lifetime),
         false,
         false,
         2usize as u8,
diff --git a/ops/op2/test_cases/sync/v8_string.out b/ops/op2/test_cases/sync/v8_string.out
index 94dbd60..6ebf2f2 100644
--- a/ops/op2/test_cases/sync/v8_string.out
+++ b/ops/op2/test_cases/sync/v8_string.out
@@ -2,10 +2,10 @@
 struct op_v8_string {
     _unconstructable: ::std::marker::PhantomData<()>,
 }
-impl deno_core::_ops::Op for op_v8_string {
+impl ::deno_core::_ops::Op for op_v8_string {
     const NAME: &'static str = stringify!(op_v8_string);
-    const DECL: deno_core::_ops::OpDecl = deno_core::_ops::OpDecl::new_internal_op2(
-        stringify!(op_v8_string),
+    const DECL: ::deno_core::_ops::OpDecl = ::deno_core::_ops::OpDecl::new_internal_op2(
+        ::deno_core::__op_name_fast!(op_v8_string),
         false,
         false,
         2usize as u8,