diff --git a/src/search/CMakeLists.txt b/src/search/CMakeLists.txt
index e9a8209a25..3ad4242129 100644
--- a/src/search/CMakeLists.txt
+++ b/src/search/CMakeLists.txt
@@ -146,6 +146,7 @@ create_fast_downward_library(
         utils/system_unix
         utils/system_windows
         utils/timer
+        utils/tuples
     CORE_LIBRARY
 )
 # On Linux, find the rt library for clock_gettime().
diff --git a/src/search/evaluator.cc b/src/search/evaluator.cc
index db63a23c9f..e06dad1835 100644
--- a/src/search/evaluator.cc
+++ b/src/search/evaluator.cc
@@ -100,13 +100,12 @@ void add_evaluator_options_to_feature(plugins::Feature &feature) {
     utils::add_log_options_to_feature(feature);
 }
 
-shared_ptr<tuple<string, utils::Verbosity>> get_evaluator_parameters_from_options(const plugins::Options &opts) {
-    return make_shared<tuple<string, utils::Verbosity>>(
-        tuple_cat(
+tuple<string, utils::Verbosity> get_evaluator_arguments_from_options(
+    const plugins::Options &opts) {
+    return tuple_cat(
             make_tuple(opts.get<string>("description")),
-            *utils::get_log_parameters_from_options(opts)
-            )
-        );
+            utils::get_log_arguments_from_options(opts)
+            );
 }
 
 static class EvaluatorCategoryPlugin : public plugins::TypedCategoryPlugin<Evaluator> {
diff --git a/src/search/evaluator.h b/src/search/evaluator.h
index f098007fde..6f92749407 100644
--- a/src/search/evaluator.h
+++ b/src/search/evaluator.h
@@ -109,6 +109,6 @@ class Evaluator {
 extern void add_evaluator_options_to_feature(plugins::Feature &feature, const std::string &description);
 extern void add_evaluator_options_to_feature(plugins::Feature &feature); // TODO 1082 remove this, just keep the one above
 
-extern std::shared_ptr<std::tuple<std::string, utils::Verbosity>> get_evaluator_parameters_from_options(const plugins::Options &opts);
+extern std::tuple<std::string, utils::Verbosity> get_evaluator_arguments_from_options(const plugins::Options &opts);
 
 #endif
diff --git a/src/search/heuristic.cc b/src/search/heuristic.cc
index 70271e6283..50422ea1be 100644
--- a/src/search/heuristic.cc
+++ b/src/search/heuristic.cc
@@ -67,13 +67,14 @@ void Heuristic::add_options_to_feature(plugins::Feature &feature) {
 }
 
 
-shared_ptr<tuple<shared_ptr<AbstractTask>, bool, string, utils::Verbosity>> Heuristic::get_heuristic_parameters_from_options(const plugins::Options &opts) {
-    auto parent_parameter_tuple = get_evaluator_parameters_from_options(opts);
-    auto own_parameter_tuple = make_tuple(
+tuple<shared_ptr<AbstractTask>, bool, string, utils::Verbosity>
+Heuristic::get_heuristic_arguments_from_options(const plugins::Options &opts) {
+    auto evaluator_args = get_evaluator_arguments_from_options(opts);
+    auto heuristic_args = make_tuple(
         opts.get<shared_ptr<AbstractTask>>("transform"),
         opts.get<bool>("cache_estimates")
         );
-    return make_shared<tuple<shared_ptr<AbstractTask>, bool, string, utils::Verbosity>>(tuple_cat(own_parameter_tuple, *parent_parameter_tuple));
+    return tuple_cat(heuristic_args, evaluator_args);
 }
 
 EvaluationResult Heuristic::compute_result(EvaluationContext &eval_context) {
diff --git a/src/search/heuristic.h b/src/search/heuristic.h
index 50c7d5e32f..c865394a7e 100644
--- a/src/search/heuristic.h
+++ b/src/search/heuristic.h
@@ -88,8 +88,8 @@ class Heuristic : public Evaluator {
     static void add_options_to_feature(plugins::Feature &feature, const std::string &description);
     static void add_options_to_feature(plugins::Feature &feature); // TODO 1082 remove this, just keep the one above
 
-    static std::shared_ptr<std::tuple<std::shared_ptr<AbstractTask>, bool, std::string, utils::Verbosity>>
-    get_heuristic_parameters_from_options(const plugins::Options &opts);
+    static std::tuple<std::shared_ptr<AbstractTask>, bool, std::string, utils::Verbosity>
+    get_heuristic_arguments_from_options(const plugins::Options &opts);
 
     virtual EvaluationResult compute_result(
         EvaluationContext &eval_context) override;
diff --git a/src/search/heuristics/additive_heuristic.cc b/src/search/heuristics/additive_heuristic.cc
index d1b109d267..92b4b3ae07 100644
--- a/src/search/heuristics/additive_heuristic.cc
+++ b/src/search/heuristics/additive_heuristic.cc
@@ -148,10 +148,6 @@ void AdditiveHeuristic::compute_heuristic_for_cegar(const State &state) {
     compute_heuristic(state);
 }
 
-shared_ptr<tuple<shared_ptr<AbstractTask>, bool, string, utils::Verbosity>> get_additive_heuristic_parameters_from_options(const plugins::Options &opts) {
-    return relaxation_heuristic::get_relaxation_heuristic_parameters_from_options(opts);
-}
-
 class AdditiveHeuristicFeature : public plugins::TypedFeature<Evaluator, AdditiveHeuristic> {
 public:
     AdditiveHeuristicFeature() : TypedFeature("add") {
@@ -175,8 +171,8 @@ class AdditiveHeuristicFeature : public plugins::TypedFeature<Evaluator, Additiv
 
     virtual shared_ptr<AdditiveHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<AdditiveHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts)
+        return plugins::make_shared_from_arg_tuples<AdditiveHeuristic>(
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/heuristics/additive_heuristic.h b/src/search/heuristics/additive_heuristic.h
index 7b746384dc..79be262043 100644
--- a/src/search/heuristics/additive_heuristic.h
+++ b/src/search/heuristics/additive_heuristic.h
@@ -83,8 +83,6 @@ class AdditiveHeuristic : public relaxation_heuristic::RelaxationHeuristic {
         return get_proposition(var, value)->cost;
     }
 };
-
-extern std::shared_ptr<std::tuple<std::shared_ptr<AbstractTask>, bool, std::string, utils::Verbosity>> get_additive_heuristic_parameters_from_options(const plugins::Options &opts);
 }
 
 #endif
diff --git a/src/search/heuristics/blind_search_heuristic.cc b/src/search/heuristics/blind_search_heuristic.cc
index 98c04601ae..6e5c2360ad 100644
--- a/src/search/heuristics/blind_search_heuristic.cc
+++ b/src/search/heuristics/blind_search_heuristic.cc
@@ -54,8 +54,8 @@ class BlindSearchHeuristicFeature : public plugins::TypedFeature<Evaluator, Blin
 
     virtual shared_ptr<BlindSearchHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<BlindSearchHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts)
+        return plugins::make_shared_from_arg_tuples<BlindSearchHeuristic>(
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/heuristics/cea_heuristic.cc b/src/search/heuristics/cea_heuristic.cc
index df87832a0e..9b7c0a1144 100644
--- a/src/search/heuristics/cea_heuristic.cc
+++ b/src/search/heuristics/cea_heuristic.cc
@@ -469,8 +469,8 @@ class ContextEnhancedAdditiveHeuristicFeature : public plugins::TypedFeature<Eva
 
     virtual shared_ptr<ContextEnhancedAdditiveHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<ContextEnhancedAdditiveHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts)
+        return plugins::make_shared_from_arg_tuples<ContextEnhancedAdditiveHeuristic>(
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/heuristics/cg_heuristic.cc b/src/search/heuristics/cg_heuristic.cc
index 400dafc5e3..f5757a2684 100644
--- a/src/search/heuristics/cg_heuristic.cc
+++ b/src/search/heuristics/cg_heuristic.cc
@@ -314,9 +314,9 @@ class CGHeuristicFeature : public plugins::TypedFeature<Evaluator, CGHeuristic>
 
     virtual shared_ptr<CGHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<CGHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts),
-            opts.get<int>("max_cache_size")
+        return plugins::make_shared_from_arg_tuples<CGHeuristic>(
+            opts.get<int>("max_cache_size"),
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/heuristics/ff_heuristic.cc b/src/search/heuristics/ff_heuristic.cc
index 5307204c3b..7066da76e9 100644
--- a/src/search/heuristics/ff_heuristic.cc
+++ b/src/search/heuristics/ff_heuristic.cc
@@ -96,8 +96,8 @@ class FFHeuristicFeature : public plugins::TypedFeature<Evaluator, FFHeuristic>
 
     virtual shared_ptr<FFHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<FFHeuristic>(
-            additive_heuristic::get_additive_heuristic_parameters_from_options(opts)
+        return plugins::make_shared_from_arg_tuples<FFHeuristic>(
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/heuristics/goal_count_heuristic.cc b/src/search/heuristics/goal_count_heuristic.cc
index 9f5c08ec2e..199181c5b6 100644
--- a/src/search/heuristics/goal_count_heuristic.cc
+++ b/src/search/heuristics/goal_count_heuristic.cc
@@ -51,8 +51,8 @@ class GoalCountHeuristicFeature : public plugins::TypedFeature<Evaluator, GoalCo
 
     virtual shared_ptr<GoalCountHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<GoalCountHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts)
+        return plugins::make_shared_from_arg_tuples<GoalCountHeuristic>(
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/heuristics/hm_heuristic.cc b/src/search/heuristics/hm_heuristic.cc
index 153af77fe5..462d50bc9b 100644
--- a/src/search/heuristics/hm_heuristic.cc
+++ b/src/search/heuristics/hm_heuristic.cc
@@ -293,9 +293,9 @@ class HMHeuristicFeature : public plugins::TypedFeature<Evaluator, HMHeuristic>
     }
 
     virtual shared_ptr<HMHeuristic> create_component(const plugins::Options &options, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<HMHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(options),
-            options.get<int>("m")
+        return plugins::make_shared_from_arg_tuples<HMHeuristic>(
+            options.get<int>("m"),
+            Heuristic::get_heuristic_arguments_from_options(options)
             );
     }
 };
diff --git a/src/search/heuristics/lm_cut_heuristic.cc b/src/search/heuristics/lm_cut_heuristic.cc
index 4cdb153a31..0724fe3c88 100644
--- a/src/search/heuristics/lm_cut_heuristic.cc
+++ b/src/search/heuristics/lm_cut_heuristic.cc
@@ -58,8 +58,8 @@ class LandmarkCutHeuristicFeature : public plugins::TypedFeature<Evaluator, Land
 
     virtual shared_ptr<LandmarkCutHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<LandmarkCutHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts)
+        return plugins::make_shared_from_arg_tuples<LandmarkCutHeuristic>(
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/heuristics/max_heuristic.cc b/src/search/heuristics/max_heuristic.cc
index b6073efcfb..304ab8b00b 100644
--- a/src/search/heuristics/max_heuristic.cc
+++ b/src/search/heuristics/max_heuristic.cc
@@ -125,8 +125,8 @@ class HSPMaxHeuristicFeature : public plugins::TypedFeature<Evaluator, HSPMaxHeu
 
     virtual shared_ptr<HSPMaxHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<HSPMaxHeuristic>(
-            relaxation_heuristic::get_relaxation_heuristic_parameters_from_options(opts));
+        return plugins::make_shared_from_arg_tuples<HSPMaxHeuristic>(
+            Heuristic::get_heuristic_arguments_from_options(opts));
     }
 };
 
diff --git a/src/search/heuristics/relaxation_heuristic.cc b/src/search/heuristics/relaxation_heuristic.cc
index 4cb1501cfd..f4353b4bc0 100644
--- a/src/search/heuristics/relaxation_heuristic.cc
+++ b/src/search/heuristics/relaxation_heuristic.cc
@@ -305,8 +305,4 @@ void RelaxationHeuristic::simplify() {
         log << " done! [" << unary_operators.size() << " unary operators]" << endl;
     }
 }
-
-shared_ptr<tuple<shared_ptr<AbstractTask>, bool, string, utils::Verbosity>> get_relaxation_heuristic_parameters_from_options(const plugins::Options &opts) {
-    return Heuristic::get_heuristic_parameters_from_options(opts);
-}
 }
diff --git a/src/search/heuristics/relaxation_heuristic.h b/src/search/heuristics/relaxation_heuristic.h
index 197c081e70..4f41497cc6 100644
--- a/src/search/heuristics/relaxation_heuristic.h
+++ b/src/search/heuristics/relaxation_heuristic.h
@@ -118,8 +118,6 @@ class RelaxationHeuristic : public Heuristic {
 
     virtual bool dead_ends_are_reliable() const override;
 };
-
-std::shared_ptr<std::tuple<std::shared_ptr<AbstractTask>, bool, std::string, utils::Verbosity>> get_relaxation_heuristic_parameters_from_options(const plugins::Options &opts);
 }
 
 #endif
diff --git a/src/search/lp/lp_solver.cc b/src/search/lp/lp_solver.cc
index 9f34d3d520..eab0a7ca82 100644
--- a/src/search/lp/lp_solver.cc
+++ b/src/search/lp/lp_solver.cc
@@ -24,6 +24,12 @@ void add_lp_solver_option_to_feature(plugins::Feature &feature) {
         "See [build instructions https://github.com/aibasel/downward/blob/main/BUILD.md].");
 }
 
+tuple<LPSolverType> get_lp_solver_arguments_from_options(
+    const plugins::Options &opts) {
+    return make_tuple(opts.get<LPSolverType>("lpsolver"));
+
+}
+
 LPConstraint::LPConstraint(double lower_bound, double upper_bound)
     : lower_bound(lower_bound),
       upper_bound(upper_bound) {
diff --git a/src/search/lp/lp_solver.h b/src/search/lp/lp_solver.h
index a9bdff8c0a..59693ffeab 100644
--- a/src/search/lp/lp_solver.h
+++ b/src/search/lp/lp_solver.h
@@ -12,6 +12,7 @@
 
 namespace plugins {
 class Feature;
+class Options;
 }
 
 namespace lp {
@@ -24,6 +25,8 @@ enum class LPObjectiveSense {
 };
 
 void add_lp_solver_option_to_feature(plugins::Feature &feature);
+std::tuple<LPSolverType> get_lp_solver_arguments_from_options(
+    const plugins::Options &opts);
 
 class LinearProgram;
 
diff --git a/src/search/merge_and_shrink/merge_and_shrink_heuristic.cc b/src/search/merge_and_shrink/merge_and_shrink_heuristic.cc
index 6952aea77e..5735c18698 100644
--- a/src/search/merge_and_shrink/merge_and_shrink_heuristic.cc
+++ b/src/search/merge_and_shrink/merge_and_shrink_heuristic.cc
@@ -255,8 +255,7 @@ class MergeAndShrinkHeuristicFeature : public plugins::TypedFeature<Evaluator, M
         plugins::Options options_copy(options);
         handle_shrink_limit_options_defaults(options_copy, context);
 
-        return plugins::make_shared_from_args_tuple_and_args<MergeAndShrinkHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(options_copy),
+        return plugins::make_shared_from_arg_tuples<MergeAndShrinkHeuristic>(
             options_copy.get<shared_ptr<MergeStrategyFactory>>("merge_strategy"),
             options_copy.get<shared_ptr<ShrinkStrategy>>("shrink_strategy"),
             options_copy.get<shared_ptr<LabelReduction>>("label_reduction", nullptr),
@@ -265,7 +264,8 @@ class MergeAndShrinkHeuristicFeature : public plugins::TypedFeature<Evaluator, M
             options_copy.get<int>("threshold_before_merge"),
             options_copy.get<bool>("prune_unreachable_states"),
             options_copy.get<bool>("prune_irrelevant_states"),
-            options_copy.get<double>("main_loop_max_time")
+            options_copy.get<double>("main_loop_max_time"),
+            Heuristic::get_heuristic_arguments_from_options(options_copy)
             );
     }
 };
diff --git a/src/search/merge_and_shrink/merge_strategy_factory.cc b/src/search/merge_and_shrink/merge_strategy_factory.cc
index 4954f5fa95..11f96a3115 100644
--- a/src/search/merge_and_shrink/merge_strategy_factory.cc
+++ b/src/search/merge_and_shrink/merge_strategy_factory.cc
@@ -24,8 +24,9 @@ void add_merge_strategy_options_to_feature(plugins::Feature &feature) {
     utils::add_log_options_to_feature(feature);
 }
 
-shared_ptr<tuple<utils::Verbosity>> get_merge_strategy_parameters_from_options(const plugins::Options &opts) {
-    return utils::get_log_parameters_from_options(opts);
+tuple<utils::Verbosity> get_merge_strategy_arguments_from_options(
+    const plugins::Options &opts) {
+    return utils::get_log_arguments_from_options(opts);
 }
 
 
diff --git a/src/search/merge_and_shrink/merge_strategy_factory.h b/src/search/merge_and_shrink/merge_strategy_factory.h
index a47ac90bbb..1d54947448 100644
--- a/src/search/merge_and_shrink/merge_strategy_factory.h
+++ b/src/search/merge_and_shrink/merge_strategy_factory.h
@@ -36,7 +36,8 @@ class MergeStrategyFactory {
 };
 
 extern void add_merge_strategy_options_to_feature(plugins::Feature &feature);
-extern std::shared_ptr<std::tuple<utils::Verbosity>> get_merge_strategy_parameters_from_options(const plugins::Options &opts);
+extern std::tuple<utils::Verbosity> get_merge_strategy_arguments_from_options(
+    const plugins::Options &opts);
 }
 
 #endif
diff --git a/src/search/merge_and_shrink/merge_strategy_factory_precomputed.cc b/src/search/merge_and_shrink/merge_strategy_factory_precomputed.cc
index 1aca76ab7c..9b9cc2a436 100644
--- a/src/search/merge_and_shrink/merge_strategy_factory_precomputed.cc
+++ b/src/search/merge_and_shrink/merge_strategy_factory_precomputed.cc
@@ -69,9 +69,9 @@ class MergeStrategyFactoryPrecomputedFeature : public plugins::TypedFeature<Merg
     }
     virtual shared_ptr<MergeStrategyFactoryPrecomputed> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<MergeStrategyFactoryPrecomputed>(
-            get_merge_strategy_parameters_from_options(opts),
-            opts.get<shared_ptr<MergeTreeFactory>>("merge_tree")
+        return plugins::make_shared_from_arg_tuples<MergeStrategyFactoryPrecomputed>(
+            opts.get<shared_ptr<MergeTreeFactory>>("merge_tree"),
+            get_merge_strategy_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/merge_and_shrink/merge_strategy_factory_sccs.cc b/src/search/merge_and_shrink/merge_strategy_factory_sccs.cc
index 1abe0a81bc..2e617a750f 100644
--- a/src/search/merge_and_shrink/merge_strategy_factory_sccs.cc
+++ b/src/search/merge_and_shrink/merge_strategy_factory_sccs.cc
@@ -202,11 +202,11 @@ class MergeStrategyFactorySCCsFeature : public plugins::TypedFeature<MergeStrate
                 "You have to specify exactly one of the options merge_tree "
                 "and merge_selector!");
         }
-        return plugins::make_shared_from_args_tuple_and_args<MergeStrategyFactorySCCs>(
-            get_merge_strategy_parameters_from_options(opts),
+        return plugins::make_shared_from_arg_tuples<MergeStrategyFactorySCCs>(
             opts.get<OrderOfSCCs>("order_of_sccs"),
             opts.get<shared_ptr<MergeTreeFactory>> ("merge_tree", nullptr),
-            opts.get<shared_ptr<MergeSelector>> ("merge_selector", nullptr)
+            opts.get<shared_ptr<MergeSelector>> ("merge_selector", nullptr),
+            get_merge_strategy_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/merge_and_shrink/merge_strategy_factory_stateless.cc b/src/search/merge_and_shrink/merge_strategy_factory_stateless.cc
index 09164a077b..3905bf4050 100644
--- a/src/search/merge_and_shrink/merge_strategy_factory_stateless.cc
+++ b/src/search/merge_and_shrink/merge_strategy_factory_stateless.cc
@@ -72,9 +72,9 @@ class MergeStrategyFactoryStatelessFeature : public plugins::TypedFeature<MergeS
 
     virtual shared_ptr<MergeStrategyFactoryStateless> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<MergeStrategyFactoryStateless>(
-            get_merge_strategy_parameters_from_options(opts),
-            opts.get<shared_ptr<MergeSelector>>("merge_selector")
+        return plugins::make_shared_from_arg_tuples<MergeStrategyFactoryStateless>(
+            opts.get<shared_ptr<MergeSelector>>("merge_selector"),
+            get_merge_strategy_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/merge_and_shrink/merge_tree_factory.cc b/src/search/merge_and_shrink/merge_tree_factory.cc
index 7d9293a163..6a6f552fc4 100644
--- a/src/search/merge_and_shrink/merge_tree_factory.cc
+++ b/src/search/merge_and_shrink/merge_tree_factory.cc
@@ -58,13 +58,11 @@ void MergeTreeFactory::add_options_to_feature(plugins::Feature &feature) {
         "use_random");
 }
 
-shared_ptr<tuple<int, UpdateOption>> get_merge_tree_parameters_from_options(const plugins::Options &opts) {
-    return make_shared<tuple<int, UpdateOption>>(
-        make_tuple(
+tuple<int, UpdateOption> get_merge_tree_arguments_from_options(const plugins::Options &opts) {
+    return make_tuple(
             opts.get<int>("random_seed"),
             opts.get<UpdateOption>("update_option")
-            )
-        );
+            );
 }
 
 static class MergeTreeFactoryCategoryPlugin : public plugins::TypedCategoryPlugin<MergeTreeFactory> {
diff --git a/src/search/merge_and_shrink/merge_tree_factory.h b/src/search/merge_and_shrink/merge_tree_factory.h
index 296dce8c1f..50bb205d57 100644
--- a/src/search/merge_and_shrink/merge_tree_factory.h
+++ b/src/search/merge_and_shrink/merge_tree_factory.h
@@ -51,7 +51,8 @@ class MergeTreeFactory {
     static void add_options_to_feature(plugins::Feature &feature);
 };
 
-extern std::shared_ptr<std::tuple<int, UpdateOption>> get_merge_tree_parameters_from_options(const plugins::Options &opts);
+extern std::tuple<int, UpdateOption> get_merge_tree_arguments_from_options(
+    const plugins::Options &opts);
 }
 
 #endif
diff --git a/src/search/merge_and_shrink/merge_tree_factory_linear.cc b/src/search/merge_and_shrink/merge_tree_factory_linear.cc
index 9e48e51e69..9cde166a21 100644
--- a/src/search/merge_and_shrink/merge_tree_factory_linear.cc
+++ b/src/search/merge_and_shrink/merge_tree_factory_linear.cc
@@ -139,9 +139,9 @@ class MergeTreeFactoryLinearFeature : public plugins::TypedFeature<MergeTreeFact
 
     virtual shared_ptr<MergeTreeFactoryLinear> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<MergeTreeFactoryLinear>(
-            get_merge_tree_parameters_from_options(opts),
-            opts.get<variable_order_finder::VariableOrderType>("variable_order")
+        return plugins::make_shared_from_arg_tuples<MergeTreeFactoryLinear>(
+            opts.get<variable_order_finder::VariableOrderType>("variable_order"),
+            get_merge_tree_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/merge_and_shrink/shrink_bucket_based.cc b/src/search/merge_and_shrink/shrink_bucket_based.cc
index 5fbd931f74..49ec490237 100644
--- a/src/search/merge_and_shrink/shrink_bucket_based.cc
+++ b/src/search/merge_and_shrink/shrink_bucket_based.cc
@@ -101,7 +101,7 @@ StateEquivalenceRelation ShrinkBucketBased::compute_equivalence_relation(
     return compute_abstraction(buckets, target_size, log);
 }
 
-shared_ptr<tuple<int>> get_shrink_bucket_parameters_from_options(const plugins::Options &opts) {
-    return make_shared<tuple<int>>(make_tuple(opts.get<int>("random_seed")));
+tuple<int> get_shrink_bucket_arguments_from_options(const plugins::Options &opts) {
+    return make_tuple(opts.get<int>("random_seed"));
 }
 }
diff --git a/src/search/merge_and_shrink/shrink_bucket_based.h b/src/search/merge_and_shrink/shrink_bucket_based.h
index 1284cf6c6b..30477033c9 100644
--- a/src/search/merge_and_shrink/shrink_bucket_based.h
+++ b/src/search/merge_and_shrink/shrink_bucket_based.h
@@ -60,7 +60,7 @@ class ShrinkBucketBased : public ShrinkStrategy {
     static void add_options_to_feature(plugins::Feature &feature);
 };
 
-extern std::shared_ptr<std::tuple<int>> get_shrink_bucket_parameters_from_options(const plugins::Options &opts);
+extern std::tuple<int> get_shrink_bucket_arguments_from_options(const plugins::Options &opts);
 }
 
 #endif
diff --git a/src/search/merge_and_shrink/shrink_fh.cc b/src/search/merge_and_shrink/shrink_fh.cc
index 6239f37d46..286fbe0762 100644
--- a/src/search/merge_and_shrink/shrink_fh.cc
+++ b/src/search/merge_and_shrink/shrink_fh.cc
@@ -249,10 +249,10 @@ class ShrinkFHFeature : public plugins::TypedFeature<ShrinkStrategy, ShrinkFH> {
 
     virtual shared_ptr<ShrinkFH> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<ShrinkFH>(
-            get_shrink_bucket_parameters_from_options(opts),
+        return plugins::make_shared_from_arg_tuples<ShrinkFH>(
             opts.get<ShrinkFH::HighLow>("shrink_f"),
-            opts.get<ShrinkFH::HighLow>("shrink_h")
+            opts.get<ShrinkFH::HighLow>("shrink_h"),
+            get_shrink_bucket_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/merge_and_shrink/shrink_random.cc b/src/search/merge_and_shrink/shrink_random.cc
index 383bc916f6..abf89f8929 100644
--- a/src/search/merge_and_shrink/shrink_random.cc
+++ b/src/search/merge_and_shrink/shrink_random.cc
@@ -46,8 +46,8 @@ class ShrinkRandomFeature : public plugins::TypedFeature<ShrinkStrategy, ShrinkR
 
     virtual shared_ptr<ShrinkRandom> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<ShrinkRandom>(
-            get_shrink_bucket_parameters_from_options(opts)
+        return plugins::make_shared_from_arg_tuples<ShrinkRandom>(
+            get_shrink_bucket_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/operator_counting/operator_counting_heuristic.cc b/src/search/operator_counting/operator_counting_heuristic.cc
index 05fa85d698..d5feb3329e 100644
--- a/src/search/operator_counting/operator_counting_heuristic.cc
+++ b/src/search/operator_counting/operator_counting_heuristic.cc
@@ -10,12 +10,18 @@
 using namespace std;
 
 namespace operator_counting {
-OperatorCountingHeuristic::OperatorCountingHeuristic(const plugins::Options &opts)
-    : Heuristic(opts),
-      constraint_generators(
-          opts.get_list<shared_ptr<ConstraintGenerator>>("constraint_generators")),
-      lp_solver(opts.get<lp::LPSolverType>("lpsolver")),
-      use_integer_operator_counts(opts.get<bool>("use_integer_operator_counts")) {
+OperatorCountingHeuristic::OperatorCountingHeuristic(
+        const vector<shared_ptr<ConstraintGenerator>> &constraint_generators,
+        bool use_integer_operator_counts,
+        lp::LPSolverType lp_solver_type,
+        const shared_ptr<AbstractTask> &transform,
+        bool cache_estimates,
+        const string &description,
+        utils::Verbosity verbosity)
+    : Heuristic(transform, cache_estimates, description, verbosity),
+      constraint_generators(constraint_generators),
+      use_integer_operator_counts(use_integer_operator_counts),
+      lp_solver(lp_solver_type) {
     lp_solver.set_mip_gap(0);
     named_vector::NamedVector<lp::LPVariable> variables;
     double infinity = lp_solver.get_infinity();
@@ -30,9 +36,6 @@ OperatorCountingHeuristic::OperatorCountingHeuristic(const plugins::Options &opt
     lp_solver.load_problem(lp);
 }
 
-OperatorCountingHeuristic::~OperatorCountingHeuristic() {
-}
-
 int OperatorCountingHeuristic::compute_heuristic(const State &ancestor_state) {
     State state = convert_ancestor_state(ancestor_state);
     assert(!lp_solver.has_temporary_constraints());
@@ -91,7 +94,7 @@ class OperatorCountingHeuristicFeature : public plugins::TypedFeature<Evaluator,
             "increase the runtime.",
             "false");
         lp::add_lp_solver_option_to_feature(*this);
-        Heuristic::add_options_to_feature(*this);
+        Heuristic::add_options_to_feature(*this, "operatorcounting");
 
         document_language_support("action costs", "supported");
         document_language_support(
@@ -115,7 +118,12 @@ class OperatorCountingHeuristicFeature : public plugins::TypedFeature<Evaluator,
     virtual shared_ptr<OperatorCountingHeuristic> create_component(const plugins::Options &options, const utils::Context &context) const override {
         plugins::verify_list_non_empty<shared_ptr<ConstraintGenerator>>(
             context, options, "constraint_generators");
-        return make_shared<OperatorCountingHeuristic>(options);
+        return plugins::make_shared_from_arg_tuples<OperatorCountingHeuristic>(
+            options.get_list<shared_ptr<ConstraintGenerator>>("constraint_generators"),
+            options.get<bool>("use_integer_operator_counts"),
+            lp::get_lp_solver_arguments_from_options(options),
+            Heuristic::get_heuristic_arguments_from_options(options)
+        );
     }
 };
 
diff --git a/src/search/operator_counting/operator_counting_heuristic.h b/src/search/operator_counting/operator_counting_heuristic.h
index ff0b326039..d7fdea3825 100644
--- a/src/search/operator_counting/operator_counting_heuristic.h
+++ b/src/search/operator_counting/operator_counting_heuristic.h
@@ -17,13 +17,19 @@ class ConstraintGenerator;
 
 class OperatorCountingHeuristic : public Heuristic {
     std::vector<std::shared_ptr<ConstraintGenerator>> constraint_generators;
-    lp::LPSolver lp_solver;
     const bool use_integer_operator_counts;
+    lp::LPSolver lp_solver;
 protected:
     virtual int compute_heuristic(const State &ancestor_state) override;
 public:
-    explicit OperatorCountingHeuristic(const plugins::Options &opts);
-    ~OperatorCountingHeuristic();
+    OperatorCountingHeuristic(
+        const std::vector<std::shared_ptr<ConstraintGenerator>> &constraint_generators,
+        bool use_integer_operator_counts,
+        lp::LPSolverType lp_solver,
+        const std::shared_ptr<AbstractTask> &transform,
+        bool cache_estimates,
+        const std::string &description,
+        utils::Verbosity verbosity);
 };
 }
 
diff --git a/src/search/pdbs/canonical_pdbs_heuristic.cc b/src/search/pdbs/canonical_pdbs_heuristic.cc
index 587173cf1c..721930a95e 100644
--- a/src/search/pdbs/canonical_pdbs_heuristic.cc
+++ b/src/search/pdbs/canonical_pdbs_heuristic.cc
@@ -125,10 +125,10 @@ class CanonicalPDBsHeuristicFeature : public plugins::TypedFeature<Evaluator, Ca
 
     virtual shared_ptr<CanonicalPDBsHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<CanonicalPDBsHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts),
+        return plugins::make_shared_from_arg_tuples<CanonicalPDBsHeuristic>(
             opts.get<shared_ptr<PatternCollectionGenerator>>("patterns"),
-            opts.get<double>("max_time_dominance_pruning")
+            opts.get<double>("max_time_dominance_pruning"),
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_collection_generator_combo.cc b/src/search/pdbs/pattern_collection_generator_combo.cc
index 5e3402b9ca..2ecd07ca6c 100644
--- a/src/search/pdbs/pattern_collection_generator_combo.cc
+++ b/src/search/pdbs/pattern_collection_generator_combo.cc
@@ -63,9 +63,9 @@ class PatternCollectionGeneratorComboFeature : public plugins::TypedFeature<Patt
 
     virtual shared_ptr<PatternCollectionGeneratorCombo> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternCollectionGeneratorCombo>(
-            get_generator_parameters_from_options(opts),
-            opts.get<int>("max_states")
+        return plugins::make_shared_from_arg_tuples<PatternCollectionGeneratorCombo>(
+            opts.get<int>("max_states"),
+            get_generator_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_collection_generator_disjoint_cegar.cc b/src/search/pdbs/pattern_collection_generator_disjoint_cegar.cc
index d8bde885b8..e0f87834e0 100644
--- a/src/search/pdbs/pattern_collection_generator_disjoint_cegar.cc
+++ b/src/search/pdbs/pattern_collection_generator_disjoint_cegar.cc
@@ -88,13 +88,13 @@ class PatternCollectionGeneratorDisjointCegarFeature : public plugins::TypedFeat
 
     virtual shared_ptr<PatternCollectionGeneratorDisjointCegar> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternCollectionGeneratorDisjointCegar>(
-            get_generator_parameters_from_options(opts),
+        return plugins::make_shared_from_arg_tuples<PatternCollectionGeneratorDisjointCegar>(
             opts.get<int>("max_pdb_size"),
             opts.get<int>("max_collection_size"),
             opts.get<double>("max_time"),
             opts.get<bool>("use_wildcard_plans"),
-            opts.get<int>("random_seed")
+            opts.get<int>("random_seed"),
+            get_generator_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_collection_generator_genetic.cc b/src/search/pdbs/pattern_collection_generator_genetic.cc
index 86700c77bf..33437165f3 100644
--- a/src/search/pdbs/pattern_collection_generator_genetic.cc
+++ b/src/search/pdbs/pattern_collection_generator_genetic.cc
@@ -396,14 +396,14 @@ class PatternCollectionGeneratorGeneticFeature : public plugins::TypedFeature<Pa
 
     virtual shared_ptr<PatternCollectionGeneratorGenetic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternCollectionGeneratorGenetic>(
-            get_generator_parameters_from_options(opts),
+        return plugins::make_shared_from_arg_tuples<PatternCollectionGeneratorGenetic>(
             opts.get<int>("pdb_max_size"),
             opts.get<int>("num_collections"),
             opts.get<int>("num_episodes"),
             opts.get<double>("mutation_probability"),
             opts.get<bool>("disjoint"),
-            opts.get<int>("random_seed")
+            opts.get<int>("random_seed"),
+            get_generator_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_collection_generator_hillclimbing.cc b/src/search/pdbs/pattern_collection_generator_hillclimbing.cc
index 38bc127c29..ec1d205be6 100644
--- a/src/search/pdbs/pattern_collection_generator_hillclimbing.cc
+++ b/src/search/pdbs/pattern_collection_generator_hillclimbing.cc
@@ -664,20 +664,20 @@ class IPDBFeature : public plugins::TypedFeature<Evaluator, CanonicalPDBsHeurist
         check_hillclimbing_options(opts, context);
 
         shared_ptr<PatternCollectionGeneratorHillclimbing> pgh =
-            plugins::make_shared_from_args_tuple_and_args<PatternCollectionGeneratorHillclimbing>(
-                get_generator_parameters_from_options(opts),
+            plugins::make_shared_from_arg_tuples<PatternCollectionGeneratorHillclimbing>(
                 opts.get<int>("pdb_max_size"),
                 opts.get<int>("collection_max_size"),
                 opts.get<int>("num_samples"),
                 opts.get<int>("min_improvement"),
                 opts.get<double>("max_time"),
-                opts.get<int>("random_seed")
+                opts.get<int>("random_seed"),
+                get_generator_arguments_from_options(opts)
                 );
 
-        return plugins::make_shared_from_args_tuple_and_args<CanonicalPDBsHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts),
+        return plugins::make_shared_from_arg_tuples<CanonicalPDBsHeuristic>(
             pgh,
-            opts.get<double>("max_time_dominance_pruning")
+            opts.get<double>("max_time_dominance_pruning"),
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_collection_generator_manual.cc b/src/search/pdbs/pattern_collection_generator_manual.cc
index dfda393cf4..6648bee58d 100644
--- a/src/search/pdbs/pattern_collection_generator_manual.cc
+++ b/src/search/pdbs/pattern_collection_generator_manual.cc
@@ -44,9 +44,9 @@ class PatternCollectionGeneratorManualFeature : public plugins::TypedFeature<Pat
 
     virtual shared_ptr<PatternCollectionGeneratorManual> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternCollectionGeneratorManual>(
-            get_generator_parameters_from_options(opts),
-            opts.get_list<Pattern>("patterns")
+        return plugins::make_shared_from_arg_tuples<PatternCollectionGeneratorManual>(
+            opts.get_list<Pattern>("patterns"),
+            get_generator_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_collection_generator_multiple.cc b/src/search/pdbs/pattern_collection_generator_multiple.cc
index f73e4f5349..1255857e0e 100644
--- a/src/search/pdbs/pattern_collection_generator_multiple.cc
+++ b/src/search/pdbs/pattern_collection_generator_multiple.cc
@@ -334,18 +334,10 @@ void add_multiple_options_to_feature(plugins::Feature &feature) {
     add_generator_options_to_feature(feature);
 }
 
-shared_ptr<tuple<
-               int,
-               int,
-               double,
-               double,
-               double,
-               double,
-               bool,
-               int,
-               utils::Verbosity>> get_patter_collection_generators_parameters_from_options(const plugins::Options &opts) {
-    auto parent = get_generator_parameters_from_options(opts);
-    tuple own_parameter_tuple = make_tuple(
+tuple<int, int, double, double, double, double, bool, int, utils::Verbosity>
+    get_multiple_arguments_from_options(const plugins::Options &opts) {
+    auto generator_args = get_generator_arguments_from_options(opts);
+    tuple multiple_args = make_tuple(
         opts.get<int>("max_pdb_size"),
         opts.get<int>("max_collection_size"),
         opts.get<double>("pattern_generation_max_time"),
@@ -355,15 +347,6 @@ shared_ptr<tuple<
         opts.get<bool>("enable_blacklist_on_stagnation"),
         opts.get<int>("random_seed")
         );
-    return make_shared<tuple<
-                           int,
-                           int,
-                           double,
-                           double,
-                           double,
-                           double,
-                           bool,
-                           int,
-                           utils::Verbosity>>(tuple_cat(own_parameter_tuple, *parent));
+    return tuple_cat(multiple_args, generator_args);
 }
 }
diff --git a/src/search/pdbs/pattern_collection_generator_multiple.h b/src/search/pdbs/pattern_collection_generator_multiple.h
index 01fa84a248..dd4a0be848 100644
--- a/src/search/pdbs/pattern_collection_generator_multiple.h
+++ b/src/search/pdbs/pattern_collection_generator_multiple.h
@@ -89,16 +89,8 @@ extern void add_multiple_algorithm_implementation_notes_to_feature(
 extern void add_multiple_options_to_feature(
     plugins::Feature &feature);
 
-extern std::shared_ptr<std::tuple<
-                           int,
-                           int,
-                           double,
-                           double,
-                           double,
-                           double,
-                           bool,
-                           int,
-                           utils::Verbosity>> get_patter_collection_generators_parameters_from_options(const plugins::Options &opts);
+extern std::tuple<int, int, double, double, double, double, bool, int, utils::Verbosity>
+    get_multiple_arguments_from_options(const plugins::Options &opts);
 }
 
 #endif
diff --git a/src/search/pdbs/pattern_collection_generator_multiple_cegar.cc b/src/search/pdbs/pattern_collection_generator_multiple_cegar.cc
index b81b65e089..fe5f982cd0 100644
--- a/src/search/pdbs/pattern_collection_generator_multiple_cegar.cc
+++ b/src/search/pdbs/pattern_collection_generator_multiple_cegar.cc
@@ -78,9 +78,9 @@ class PatternCollectionGeneratorMultipleCegarFeature : public plugins::TypedFeat
 
     virtual shared_ptr<PatternCollectionGeneratorMultipleCegar> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternCollectionGeneratorMultipleCegar>(
-            get_patter_collection_generators_parameters_from_options(opts),
-            opts.get<bool>("use_wildcard_plans")
+        return plugins::make_shared_from_arg_tuples<PatternCollectionGeneratorMultipleCegar>(
+            opts.get<bool>("use_wildcard_plans"),
+            get_multiple_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_collection_generator_multiple_random.cc b/src/search/pdbs/pattern_collection_generator_multiple_random.cc
index c66976dcce..96de830e66 100644
--- a/src/search/pdbs/pattern_collection_generator_multiple_random.cc
+++ b/src/search/pdbs/pattern_collection_generator_multiple_random.cc
@@ -91,9 +91,9 @@ class PatternCollectionGeneratorMultipleRandomFeature : public plugins::TypedFea
 
     virtual shared_ptr<PatternCollectionGeneratorMultipleRandom> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternCollectionGeneratorMultipleRandom>(
-            get_patter_collection_generators_parameters_from_options(opts),
-            opts.get<bool>("bidirectional")
+        return plugins::make_shared_from_arg_tuples<PatternCollectionGeneratorMultipleRandom>(
+            opts.get<bool>("bidirectional"),
+            get_multiple_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_collection_generator_systematic.cc b/src/search/pdbs/pattern_collection_generator_systematic.cc
index 3b47523107..6ac9800392 100644
--- a/src/search/pdbs/pattern_collection_generator_systematic.cc
+++ b/src/search/pdbs/pattern_collection_generator_systematic.cc
@@ -318,10 +318,10 @@ class PatternCollectionGeneratorSystematicFeature : public plugins::TypedFeature
 
     virtual shared_ptr<PatternCollectionGeneratorSystematic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternCollectionGeneratorSystematic>(
-            get_generator_parameters_from_options(opts),
+        return plugins::make_shared_from_arg_tuples<PatternCollectionGeneratorSystematic>(
             opts.get<int>("pattern_max_size"),
-            opts.get<bool>("only_interesting_patterns")
+            opts.get<bool>("only_interesting_patterns"),
+            get_generator_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_generator.cc b/src/search/pdbs/pattern_generator.cc
index 6f78a6a9ff..160dec1e1a 100644
--- a/src/search/pdbs/pattern_generator.cc
+++ b/src/search/pdbs/pattern_generator.cc
@@ -48,8 +48,8 @@ void add_generator_options_to_feature(plugins::Feature &feature) {
     utils::add_log_options_to_feature(feature);
 }
 
-shared_ptr<tuple<utils::Verbosity>> get_generator_parameters_from_options(const plugins::Options &opts) {
-    return utils::get_log_parameters_from_options(opts);
+tuple<utils::Verbosity> get_generator_arguments_from_options(const plugins::Options &opts) {
+    return utils::get_log_arguments_from_options(opts);
 }
 
 static class PatternCollectionGeneratorCategoryPlugin : public plugins::TypedCategoryPlugin<PatternCollectionGenerator> {
diff --git a/src/search/pdbs/pattern_generator.h b/src/search/pdbs/pattern_generator.h
index 3c63728c38..c30e85c046 100644
--- a/src/search/pdbs/pattern_generator.h
+++ b/src/search/pdbs/pattern_generator.h
@@ -51,7 +51,7 @@ class PatternGenerator {
 };
 
 extern void add_generator_options_to_feature(plugins::Feature &feature);
-extern std::shared_ptr<std::tuple<utils::Verbosity>> get_generator_parameters_from_options(const plugins::Options &opts);
+extern std::tuple<utils::Verbosity> get_generator_arguments_from_options(const plugins::Options &opts);
 }
 
 #endif
diff --git a/src/search/pdbs/pattern_generator_cegar.cc b/src/search/pdbs/pattern_generator_cegar.cc
index ad2be2127a..7acde339cc 100644
--- a/src/search/pdbs/pattern_generator_cegar.cc
+++ b/src/search/pdbs/pattern_generator_cegar.cc
@@ -78,12 +78,12 @@ class PatternGeneratorCEGARFeature : public plugins::TypedFeature<PatternGenerat
 
     virtual shared_ptr<PatternGeneratorCEGAR> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternGeneratorCEGAR>(
-            get_generator_parameters_from_options(opts),
+        return plugins::make_shared_from_arg_tuples<PatternGeneratorCEGAR>(
             opts.get<int>("max_pdb_size"),
             opts.get<double>("max_time"),
             opts.get<bool>("use_wildcard_plans"),
-            opts.get<int>("random_seed")
+            opts.get<int>("random_seed"),
+            get_generator_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_generator_greedy.cc b/src/search/pdbs/pattern_generator_greedy.cc
index 4579d76716..63479d3c55 100644
--- a/src/search/pdbs/pattern_generator_greedy.cc
+++ b/src/search/pdbs/pattern_generator_greedy.cc
@@ -65,9 +65,9 @@ class PatternGeneratorGreedyFeature : public plugins::TypedFeature<PatternGenera
 
     virtual shared_ptr<PatternGeneratorGreedy> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternGeneratorGreedy>(
-            get_generator_parameters_from_options(opts),
-            opts.get<int>("max_states")
+        return plugins::make_shared_from_arg_tuples<PatternGeneratorGreedy>(
+            opts.get<int>("max_states"),
+            get_generator_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_generator_manual.cc b/src/search/pdbs/pattern_generator_manual.cc
index e8ca40f670..c5043b750e 100644
--- a/src/search/pdbs/pattern_generator_manual.cc
+++ b/src/search/pdbs/pattern_generator_manual.cc
@@ -44,9 +44,9 @@ class PatternGeneratorManualFeature : public plugins::TypedFeature<PatternGenera
 
     virtual shared_ptr<PatternGeneratorManual> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternGeneratorManual>(
-            get_generator_parameters_from_options(opts),
-            opts.get_list<int>("pattern")
+        return plugins::make_shared_from_arg_tuples<PatternGeneratorManual>(
+            opts.get_list<int>("pattern"),
+            get_generator_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pattern_generator_random.cc b/src/search/pdbs/pattern_generator_random.cc
index bb50e03cf0..cfdfd2c505 100644
--- a/src/search/pdbs/pattern_generator_random.cc
+++ b/src/search/pdbs/pattern_generator_random.cc
@@ -83,12 +83,12 @@ class PatternGeneratorRandomFeature : public plugins::TypedFeature<PatternGenera
 
     virtual shared_ptr<PatternGeneratorRandom> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PatternGeneratorRandom>(
-            get_generator_parameters_from_options(opts),
+        return plugins::make_shared_from_arg_tuples<PatternGeneratorRandom>(
             opts.get<int>("max_pdb_size"),
             opts.get<double>("max_time"),
             opts.get<bool>("bidirectional"),
-            opts.get<int>("random_seed")
+            opts.get<int>("random_seed"),
+            get_generator_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/pdb_heuristic.cc b/src/search/pdbs/pdb_heuristic.cc
index fa9b614295..5a37f42fa0 100644
--- a/src/search/pdbs/pdb_heuristic.cc
+++ b/src/search/pdbs/pdb_heuristic.cc
@@ -60,9 +60,9 @@ class PDBHeuristicFeature : public plugins::TypedFeature<Evaluator, PDBHeuristic
 
     virtual shared_ptr<PDBHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<PDBHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts),
-            opts.get<shared_ptr<PatternGenerator>>("pattern")
+        return plugins::make_shared_from_arg_tuples<PDBHeuristic>(
+            opts.get<shared_ptr<PatternGenerator>>("pattern"),
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/pdbs/zero_one_pdbs_heuristic.cc b/src/search/pdbs/zero_one_pdbs_heuristic.cc
index d8cfc36388..187ab009c8 100644
--- a/src/search/pdbs/zero_one_pdbs_heuristic.cc
+++ b/src/search/pdbs/zero_one_pdbs_heuristic.cc
@@ -70,9 +70,9 @@ class ZeroOnePDBsHeuristicFeature : public plugins::TypedFeature<Evaluator, Zero
 
     virtual shared_ptr<ZeroOnePDBsHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
-        return plugins::make_shared_from_args_tuple_and_args<ZeroOnePDBsHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts),
-            opts.get<shared_ptr<PatternCollectionGenerator>>("patterns")
+        return plugins::make_shared_from_arg_tuples<ZeroOnePDBsHeuristic>(
+            opts.get<shared_ptr<PatternCollectionGenerator>>("patterns"),
+            Heuristic::get_heuristic_arguments_from_options(opts)
             );
     }
 };
diff --git a/src/search/plugins/plugin.h b/src/search/plugins/plugin.h
index 7f06ecc686..deaf29f304 100644
--- a/src/search/plugins/plugin.h
+++ b/src/search/plugins/plugin.h
@@ -8,6 +8,7 @@
 
 #include "../utils/strings.h"
 #include "../utils/system.h"
+#include "../utils/tuples.h"
 
 #include <string>
 #include <typeindex>
@@ -115,17 +116,19 @@ class TypedFeature : public FeatureAuto<Constructed> {
     }
 };
 
-// Treats first parameter as pointer to a tuple of arguments for the base class,
-// the rest as singleton arguments for the class T.
+/*
+  Expects constructor arguments of T. Consecutive arguments may be grouped in a
+  tuple. All tuples in the arguments will be flattened before calling the
+  constructor. The resulting arguments will be used as arguments to make_shared.
+*/
 // TODO issue1082 where should this live? optimize with std::forward?
-// Apply the arguments extracted from *parameter_tuple* to make_shared<T>
-template<typename T, typename ParentTuple, typename ... ChildSingletons>
-std::shared_ptr<T> make_shared_from_args_tuple_and_args(ParentTuple parent_tuple, ChildSingletons ... child_singletons) {
-    return std::apply([](auto ... args) {
-                          return std::make_shared<T>(args ...);
-                      },
-                      std::tuple_cat(std::make_tuple(child_singletons ...), *parent_tuple)
-                      );
+template<typename T, typename ...Arguments>
+std::shared_ptr<T> make_shared_from_arg_tuples(Arguments...arguments) {
+    return std::apply(
+        [](auto...flattened_args) {
+            return std::make_shared<T>(flattened_args...);
+        },
+        utils::flatten_tuple(std::tuple<Arguments...>(arguments...)));
 }
 
 class Plugin {
diff --git a/src/search/utils/logging.cc b/src/search/utils/logging.cc
index 9ff686f91b..aa8cfe1077 100644
--- a/src/search/utils/logging.cc
+++ b/src/search/utils/logging.cc
@@ -30,14 +30,11 @@ void add_log_options_to_feature(plugins::Feature &feature) {
         "normal");
 }
 
-
-shared_ptr<tuple<Verbosity>> get_log_parameters_from_options(const plugins::Options &opts) {
+tuple<Verbosity> get_log_arguments_from_options(const plugins::Options &opts) {
     auto own_tuple = make_tuple<Verbosity>(opts.get<Verbosity>("verbosity"));
-    return make_shared<tuple<Verbosity>>(own_tuple);
+    return tuple<Verbosity>(own_tuple);
 }
 
-
-
 LogProxy get_log_for_verbosity(const Verbosity &verbosity) {
     if (verbosity == Verbosity::NORMAL) {
         return LogProxy(global_log);
diff --git a/src/search/utils/logging.h b/src/search/utils/logging.h
index da11c4c6ec..7f2c0605dd 100644
--- a/src/search/utils/logging.h
+++ b/src/search/utils/logging.h
@@ -131,7 +131,7 @@ extern LogProxy g_log;
 
 extern void add_log_options_to_feature(plugins::Feature &feature);
 
-extern std::shared_ptr<std::tuple<Verbosity>> get_log_parameters_from_options(const plugins::Options &opts);
+extern std::tuple<Verbosity> get_log_arguments_from_options(const plugins::Options &opts);
 
 
 
diff --git a/src/search/utils/tuples.h b/src/search/utils/tuples.h
new file mode 100644
index 0000000000..a4271bcf56
--- /dev/null
+++ b/src/search/utils/tuples.h
@@ -0,0 +1,76 @@
+#ifndef UTILS_TUPLES_H
+#define UTILS_TUPLES_H
+
+#include <tuple>
+
+/*
+  Tuple flattening code is taken from https://stackoverflow.com/a/32168028
+  (We could probably simplify this a lot if we assume tuple elements will all be
+  cheap to copy.)
+*/
+
+namespace utils {
+template<class U, class T, bool can_move>
+struct wrapper {
+    T* ptr;
+    wrapper(T& t) : ptr(std::addressof(t)) {}
+
+    using unwrapped_type =
+        std::conditional_t<can_move,
+                           std::conditional_t<std::is_lvalue_reference<U>{}, T&, T&&>,
+                           std::conditional_t<std::is_rvalue_reference<U>{}, T&&, T&>>;
+    using tuple_element_type = U;
+
+    unwrapped_type unwrap() const{
+        return std::forward<unwrapped_type>(*ptr);
+    }
+};
+
+template<class... Wrappers, std::size_t... Is>
+auto unwrap_tuple(const std::tuple<Wrappers...>& t, std::index_sequence<Is...>) {
+    return std::tuple<typename Wrappers::tuple_element_type...>(std::get<Is>(t).unwrap()...);
+}
+
+template<class... Wrappers>
+auto unwrap_tuple(const std::tuple<Wrappers...>& t) {
+    return unwrap_tuple(t, std::index_sequence_for<Wrappers...>());
+}
+
+template<bool can_move, class V, class T>
+auto wrap_and_flatten(T& t, char){
+    return std::make_tuple(wrapper<V, T, can_move>(t));
+}
+template<class T> struct is_tuple : std::false_type {};
+template<class... Ts> struct is_tuple<std::tuple<Ts...>> : std::true_type {};
+template<class T> struct is_tuple<const T> : is_tuple<T> {};
+template<class T> struct is_tuple<volatile T> : is_tuple<T> {};
+
+template<bool can_move, class, class Tuple,
+         class = std::enable_if_t<is_tuple<std::decay_t<Tuple>>{}>>
+auto wrap_and_flatten(Tuple& t, int);
+
+template<bool can_move, class Tuple, std::size_t... Is>
+auto wrap_and_flatten(Tuple& t, std::index_sequence<Is...>) {
+    return std::tuple_cat(wrap_and_flatten<can_move, std::tuple_element_t<Is, std::remove_cv_t<Tuple>>>(std::get<Is>(t), 0)...);
+}
+
+template<bool can_move, class V, class Tuple, class>
+auto wrap_and_flatten(Tuple& t, int) {
+    using seq_type = std::make_index_sequence<std::tuple_size<Tuple>{}>;
+    return wrap_and_flatten<can_move>(t, seq_type());
+}
+
+template<class Tuple>
+auto wrap_and_flatten_tuple(Tuple&& t){
+    constexpr bool can_move = !std::is_lvalue_reference<Tuple>{};
+    using seq_type = std::make_index_sequence<std::tuple_size<std::decay_t<Tuple>>{}>;
+    return wrap_and_flatten<can_move>(t, seq_type());
+}
+
+template <typename T>
+auto flatten_tuple(T&& t) {
+    return unwrap_tuple(wrap_and_flatten_tuple(std::forward<T>(t)));
+}
+}
+
+#endif