diff --git a/lib/msf/base/simple/auxiliary.rb b/lib/msf/base/simple/auxiliary.rb
index 4af93acd7a..708396ce89 100644
--- a/lib/msf/base/simple/auxiliary.rb
+++ b/lib/msf/base/simple/auxiliary.rb
@@ -45,7 +45,7 @@ module Auxiliary
 
     # Clone the module to prevent changes to the original instance
     mod = omod.replicant
-    Msf::Simple::Framework.simplify_module( mod, false )
+    Msf::Simple::Framework.simplify_module(mod)
     yield(mod) if block_given?
 
     # Import options from the OptionStr or Option hash.
@@ -109,7 +109,7 @@ module Auxiliary
   # 	The local output through which data can be displayed.
   #
   def self.check_simple(mod, opts, job_listener: Msf::Simple::NoopJobListener.instance)
-    Msf::Simple::Framework.simplify_module(mod, false)
+    Msf::Simple::Framework.simplify_module(mod)
 
     mod._import_extra_options(opts)
     if opts['LocalInput']
diff --git a/lib/msf/base/simple/evasion.rb b/lib/msf/base/simple/evasion.rb
index 04d1c1432a..9a7528aaa8 100644
--- a/lib/msf/base/simple/evasion.rb
+++ b/lib/msf/base/simple/evasion.rb
@@ -13,7 +13,7 @@ module Evasion
     begin
       # Clone the module to prevent changes to the original instance
 
-      Msf::Simple::Framework.simplify_module( evasion, false )
+      Msf::Simple::Framework.simplify_module(evasion)
       yield(evasion) if block_given?
 
       # Import options from the OptionStr or Option hash.
diff --git a/lib/msf/base/simple/exploit.rb b/lib/msf/base/simple/exploit.rb
index c4696d7635..8bac78abae 100644
--- a/lib/msf/base/simple/exploit.rb
+++ b/lib/msf/base/simple/exploit.rb
@@ -60,7 +60,7 @@ module Exploit
     begin
       # Clone the module to prevent changes to the original instance
 
-      Msf::Simple::Framework.simplify_module( exploit, false )
+      Msf::Simple::Framework.simplify_module(exploit)
       yield(exploit) if block_given?
 
       # Import options from the OptionStr or Option hash.
@@ -181,7 +181,7 @@ module Exploit
   # 	The local output through which data can be displayed.
   #
   def self.check_simple(mod, opts, job_listener: Msf::Simple::NoopJobListener.instance)
-    Msf::Simple::Framework.simplify_module(mod, false)
+    Msf::Simple::Framework.simplify_module(mod)
     mod._import_extra_options(opts)
 
     if opts['LocalInput']
diff --git a/lib/msf/base/simple/framework.rb b/lib/msf/base/simple/framework.rb
index 1e9c05ec02..f8a9c5df15 100644
--- a/lib/msf/base/simple/framework.rb
+++ b/lib/msf/base/simple/framework.rb
@@ -47,7 +47,7 @@ module Framework
   # Simplifies module instances when they're created.
   #
   def on_module_created(instance)
-    Msf::Simple::Framework.simplify_module(instance)
+    Msf::Simple::Framework.simplify_module(instance, load_saved_config: true)
   end
 
   ModuleSimplifiers =
@@ -131,7 +131,7 @@ module Framework
   # Simplifies a module instance if the type is supported by extending it
   # with the simplified module interface.
   #
-  def self.simplify_module(instance, load_saved_config = true)
+  def self.simplify_module(instance, load_saved_config: false)
     if ((ModuleSimplifiers[instance.type]) and
         (instance.class.include?(ModuleSimplifiers[instance.type]) == false))
       instance.extend(ModuleSimplifiers[instance.type])
diff --git a/lib/msf/base/simple/post.rb b/lib/msf/base/simple/post.rb
index a467dc3bff..6c9a63f03a 100644
--- a/lib/msf/base/simple/post.rb
+++ b/lib/msf/base/simple/post.rb
@@ -41,7 +41,7 @@ module Post
 
     # Clone the module to prevent changes to the original instance
     mod = omod.replicant
-    Msf::Simple::Framework.simplify_module( mod, false )
+    Msf::Simple::Framework.simplify_module(mod)
     yield(mod) if block_given?
 
     # Import options from the OptionStr or Option hash.
diff --git a/lib/msf/ui/console/module_command_dispatcher.rb b/lib/msf/ui/console/module_command_dispatcher.rb
index 651ebf1838..2ac35287d1 100644
--- a/lib/msf/ui/console/module_command_dispatcher.rb
+++ b/lib/msf/ui/console/module_command_dispatcher.rb
@@ -87,7 +87,7 @@ module ModuleCommandDispatcher
           nmod = mod.replicant
           nmod.datastore['RHOST'] = thr_host[:address].dup
           nmod.datastore['VHOST'] = thr_host[:hostname].dup if nmod.options.include?('VHOST') && nmod.datastore['VHOST'].blank?
-          Msf::Simple::Framework.simplify_module(nmod, false)
+          Msf::Simple::Framework.simplify_module(nmod)
           check_simple(nmod)
         }
       end
diff --git a/spec/lib/msf/ui/console/command_dispatcher/auxiliary_spec.rb b/spec/lib/msf/ui/console/command_dispatcher/auxiliary_spec.rb
index daa7c09eb4..d0f1a0a0d8 100644
--- a/spec/lib/msf/ui/console/command_dispatcher/auxiliary_spec.rb
+++ b/spec/lib/msf/ui/console/command_dispatcher/auxiliary_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe Msf::Ui::Console::CommandDispatcher::Auxiliary do
     allow(mod).to receive(:framework).and_return(framework)
     allow(mod).to receive(:datastore).and_return(datastore)
     datastore.import_options(mod.options)
-    Msf::Simple::Framework.simplify_module(mod, false)
+    Msf::Simple::Framework.simplify_module(mod)
     mod
   end
 
@@ -90,7 +90,7 @@ RSpec.describe Msf::Ui::Console::CommandDispatcher::Auxiliary do
     allow(mod).to receive(:framework).and_return(framework)
     allow(mod).to receive(:datastore).and_return(datastore)
     datastore.import_options(mod.options)
-    Msf::Simple::Framework.simplify_module(mod, false)
+    Msf::Simple::Framework.simplify_module(mod)
     mod
   end
 
@@ -141,7 +141,7 @@ RSpec.describe Msf::Ui::Console::CommandDispatcher::Auxiliary do
     allow(mod).to receive(:framework).and_return(framework)
     allow(mod).to receive(:datastore).and_return(datastore)
     datastore.import_options(mod.options)
-    Msf::Simple::Framework.simplify_module(mod, false)
+    Msf::Simple::Framework.simplify_module(mod)
     mod
   end
 
diff --git a/spec/lib/msf/ui/console/command_dispatcher/exploit_spec.rb b/spec/lib/msf/ui/console/command_dispatcher/exploit_spec.rb
index c6236fcd7c..724e11b367 100644
--- a/spec/lib/msf/ui/console/command_dispatcher/exploit_spec.rb
+++ b/spec/lib/msf/ui/console/command_dispatcher/exploit_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe Msf::Ui::Console::CommandDispatcher::Exploit do
     allow(mod).to receive(:framework).and_return(framework)
     allow(mod).to receive(:datastore).and_return(datastore)
     datastore.import_options(mod.options)
-    Msf::Simple::Framework.simplify_module(mod, false)
+    Msf::Simple::Framework.simplify_module(mod)
     mod
   end
 
@@ -90,7 +90,7 @@ RSpec.describe Msf::Ui::Console::CommandDispatcher::Exploit do
     allow(mod).to receive(:framework).and_return(framework)
     allow(mod).to receive(:datastore).and_return(datastore)
     datastore.import_options(mod.options)
-    Msf::Simple::Framework.simplify_module(mod, false)
+    Msf::Simple::Framework.simplify_module(mod)
     mod
   end