1 files changed, 8 insertions, 9 deletions
diff --git a/src/passes/ExtractFunction.cpp b/src/passes/ExtractFunction.cpp
index f75c04cbe..e3f2a5538 100644
--- a/src/passes/ExtractFunction.cpp
+++ b/src/passes/ExtractFunction.cpp
@@ -54,25 +54,24 @@ static void extract(PassRunner* runner, Module* module, Name name) {
   // Remove unneeded things.
   PassRunner postRunner(runner);
   postRunner.add("remove-unused-module-elements");
-  postRunner.setIsNested(true);
   postRunner.run();
 }
 
 struct ExtractFunction : public Pass {
-  void run(PassRunner* runner, Module* module) override {
-    Name name = runner->options.getArgument(
+  void run(Module* module) override {
+    Name name = getPassOptions().getArgument(
       "extract-function",
       "ExtractFunction usage:  wasm-opt --extract-function=FUNCTION_NAME");
-    extract(runner, module, name);
+    extract(getPassRunner(), module, name);
   }
 };
 
 struct ExtractFunctionIndex : public Pass {
-  void run(PassRunner* runner, Module* module) override {
+  void run(Module* module) override {
     std::string index =
-      runner->options.getArgument("extract-function-index",
-                                  "ExtractFunctionIndex usage: wasm-opt "
-                                  "--extract-function-index=FUNCTION_INDEX");
+      getPassOptions().getArgument("extract-function-index",
+                                   "ExtractFunctionIndex usage: wasm-opt "
+                                   "--extract-function-index=FUNCTION_INDEX");
     for (char c : index) {
       if (!std::isdigit(c)) {
         Fatal() << "Expected numeric function index";
@@ -85,7 +84,7 @@ struct ExtractFunctionIndex : public Pass {
     }
     // Assumes imports are at the beginning
     Name name = module->functions[i]->name;
-    extract(runner, module, name);
+    extract(getPassRunner(), module, name);
   }
 };