diff --git a/Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h b/Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h
index 57162e18a80..550454df1a5 100644
--- a/Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h
+++ b/Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h
@@ -164,11 +164,18 @@ lloyd_optimize_mesh_2(CDT& cdt, const CGAL_NP_CLASS& np = parameters::default_va
 }
 
 #ifndef DOXYGEN_RUNNING
-  template<typename CDT, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
+  // Overload handling parameters passed with operator=
+  template<typename CDT,
+           typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+           typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+           typename ... NP>
   Mesh_optimization_return_code
-  lloyd_optimize_mesh_2(CDT& cdt, const CGAL_NP_CLASS& ... nps)
+  perturb_periodic_3_mesh_3(CDT& cdt,
+                            const CGAL_NP_CLASS_1&  np1,
+                            const CGAL_NP_CLASS_2&  np2,
+                            const NP& ... nps)
   {
-    return lloyd_optimize_mesh_2(cdt, internal_np::combine_named_parameters(nps ...));
+    return lloyd_optimize_mesh_2(cdt, internal_np::combine_named_parameters(np1, np2, nps...));
   }
 
   /**
diff --git a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
index 6547264895a..9e26458c210 100644
--- a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
@@ -414,17 +414,17 @@ public:
                 parameters::choose_parameter(parameters::get_parameter(np, internal_np::null_subdomain_index_param), Null_subdomain_index()),
                 parameters::choose_parameter(parameters::get_parameter(np, internal_np::rng), nullptr))
   {}
-#if !defined(BOOST_MSVC)
-  template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-  Labeled_mesh_domain_3(const CGAL_NP_CLASS& ... nps)
-    : Labeled_mesh_domain_3(internal_np::combine_named_parameters(nps...))
-  {}
-#else
-  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-  Labeled_mesh_domain_3(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+
+  // Overload handling parameters passed with operator=
+  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+           typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+           typename ... NP>
+  Labeled_mesh_domain_3(const CGAL_NP_CLASS_1&  np1,
+                        const CGAL_NP_CLASS_2&  np2,
+                        const NP& ... nps)
     : Labeled_mesh_domain_3(internal_np::combine_named_parameters(np1, np2, nps...))
   {}
-#endif
+
 
 #ifndef CGAL_NO_DEPRECATED_CODE
   template<typename Function, typename Bounding_object, typename CGAL_NP_TEMPLATE_PARAMETERS>
@@ -662,31 +662,29 @@ public:
                      create_construct_surface_patch_index(construct_surface_patch_index_));
 
   }
-#if !defined(BOOST_MSVC)
-  template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-  static Labeled_mesh_domain_3 create_gray_image_mesh_domain(const CGAL::Image_3& image_, const CGAL_NP_CLASS& ... nps)
-  {
-    return create_gray_image_mesh_domain(image_, internal_np::combine_named_parameters(nps...));
-  }
 
-  template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-  static Labeled_mesh_domain_3 create_gray_image_mesh_domain(const CGAL_NP_CLASS& ... nps)
-  {
-    return create_gray_image_mesh_domain(internal_np::combine_named_parameters(nps...));
-  }
-#else
-  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-  static Labeled_mesh_domain_3 create_gray_image_mesh_domain(const CGAL::Image_3& image_, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+  // Overload handling parameters passed with operator=
+  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+           typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+           typename ... NP>
+  static Labeled_mesh_domain_3 create_gray_image_mesh_domain(const CGAL::Image_3& image_,
+                                                             const CGAL_NP_CLASS_1&  np1,
+                                                             const CGAL_NP_CLASS_2&  np2,
+                                                             const NP& ... nps)
   {
     return create_gray_image_mesh_domain(image_, internal_np::combine_named_parameters(np1, np2, nps...));
   }
-
-  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-  static Labeled_mesh_domain_3 create_gray_image_mesh_domain(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+  // Overload handling parameters passed with operator=
+  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+           typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+           typename ... NP>
+  static Labeled_mesh_domain_3 create_gray_image_mesh_domain(const CGAL_NP_CLASS_1&  np1,
+                                                             const CGAL_NP_CLASS_2&  np2,
+                                                             const NP& ... nps)
   {
     return create_gray_image_mesh_domain(internal_np::combine_named_parameters(np1, np2, nps...));
   }
-#endif
+
   template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT>
   static Labeled_mesh_domain_3 create_labeled_image_mesh_domain(const CGAL_NP_CLASS& np)
   {
@@ -696,30 +694,28 @@ public:
     return create_labeled_image_mesh_domain(image_, np);
   }
 
-#if !defined(BOOST_MSVC)
-  template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-  static Labeled_mesh_domain_3 create_labeled_image_mesh_domain(const CGAL::Image_3& image_, const CGAL_NP_CLASS& ... nps)
-  {
-    return create_labeled_image_mesh_domain(image_, internal_np::combine_named_parameters(nps...));
-  }
-  template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-  static Labeled_mesh_domain_3 create_labeled_image_mesh_domain(const CGAL_NP_CLASS& ... nps)
-  {
-    return create_labeled_image_mesh_domain(internal_np::combine_named_parameters(nps...));
-  }
-#else
-  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-  static Labeled_mesh_domain_3 create_labeled_image_mesh_domain(const CGAL::Image_3& image_, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+  // Overload handling parameters passed with operator=
+  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+           typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+           typename ... NP>
+  static Labeled_mesh_domain_3 create_labeled_image_mesh_domain(const CGAL::Image_3& image_,
+                                                                const CGAL_NP_CLASS_1&  np1,
+                                                                const CGAL_NP_CLASS_2&  np2,
+                                                                const NP& ... nps)
   {
     return create_labeled_image_mesh_domain(image_, internal_np::combine_named_parameters(np1, np2, nps...));
   }
-  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-  static Labeled_mesh_domain_3 create_labeled_image_mesh_domain(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+  // Overload handling parameters passed with operator=
+  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+           typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+           typename ... NP>
+  static Labeled_mesh_domain_3 create_labeled_image_mesh_domain(const CGAL_NP_CLASS_1&  np1,
+                                                                const CGAL_NP_CLASS_2&  np2,
+                                                                const NP& ... nps)
   {
     return create_labeled_image_mesh_domain(internal_np::combine_named_parameters(np1, np2, nps...));
   }
 #endif
-#endif
 
 /// \name Creation of domains from implicit functions
 /// @{
@@ -804,19 +800,17 @@ public:
                                        np);
   }
 
-#if !defined(BOOST_MSVC)
-  template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-  static Labeled_mesh_domain_3 create_implicit_mesh_domain(const CGAL_NP_CLASS& ... nps)
-  {
-    return create_implicit_mesh_domain(internal_np::combine_named_parameters(nps...));
-  }
-#else
-  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-  static Labeled_mesh_domain_3 create_implicit_mesh_domain(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+  // Overload handling parameters passed with operator=
+  template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+           typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+           typename ... NP>
+  static Labeled_mesh_domain_3 create_implicit_mesh_domain(const CGAL_NP_CLASS_1&  np1,
+                                                           const CGAL_NP_CLASS_2&  np2,
+                                                           const NP& ... nps)
   {
     return create_implicit_mesh_domain(internal_np::combine_named_parameters(np1, np2, nps...));
   }
-#endif
+
 
 #ifndef CGAL_NO_DEPRECATED_CODE
   template<typename SubdomainIndex = Null_functor,
diff --git a/Mesh_3/include/CGAL/Mesh_criteria_3.h b/Mesh_3/include/CGAL/Mesh_criteria_3.h
index 6d9ee1aa251..4539fcdae8f 100644
--- a/Mesh_3/include/CGAL/Mesh_criteria_3.h
+++ b/Mesh_3/include/CGAL/Mesh_criteria_3.h
@@ -286,18 +286,16 @@ Mesh_criteria_3(const CGAL_NP_CLASS& np = parameters::default_values()): Base(np
 {
 }
 
-#if !defined(BOOST_MSVC)
-template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_criteria_3(const CGAL_NP_CLASS& ... nps):Mesh_criteria_3(internal_np::combine_named_parameters(nps...))
-{
-}
-#else
-template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_criteria_3(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_criteria_3(const CGAL_NP_CLASS_1&  np1,
+                const CGAL_NP_CLASS_2&  np2,
+                const NP& ... nps)
   : Mesh_criteria_3(internal_np::combine_named_parameters(np1, np2, nps...))
 {
 }
-#endif
 
 };  // end class Mesh_criteria_3
 
diff --git a/Mesh_3/include/CGAL/exude_mesh_3.h b/Mesh_3/include/CGAL/exude_mesh_3.h
index e020d631513..82ec7d512b2 100644
--- a/Mesh_3/include/CGAL/exude_mesh_3.h
+++ b/Mesh_3/include/CGAL/exude_mesh_3.h
@@ -109,22 +109,18 @@ Mesh_optimization_return_code exude_mesh_3(C3T3& c3t3, double time_limit = 0, do
 }
 #endif
 #ifndef DOXYGEN_RUNNING
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code exude_mesh_3(C3T3& c3t3, const CGAL_NP_CLASS& ... nps)
-{
-  return exude_mesh_3(c3t3,internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code exude_mesh_3(C3T3& c3t3, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code exude_mesh_3(C3T3& c3t3,
+                                           const CGAL_NP_CLASS_1&  np1,
+                                           const CGAL_NP_CLASS_2&  np2,
+                                           const NP& ... nps)
 {
   return exude_mesh_3(c3t3,internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
-
-
-
 
 template <typename C3T3>
 Mesh_optimization_return_code
diff --git a/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h b/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h
index 70964c4cf3a..8c5a2c8c3da 100644
--- a/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h
+++ b/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h
@@ -148,20 +148,15 @@ Mesh_optimization_return_code lloyd_optimize_mesh_3(C3T3& c3t3, MeshDomain& doma
 }
 
 #ifndef DOXYGEN_RUNNING
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain,typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code lloyd_optimize_mesh_3(C3T3& c3t3,MeshDomain& domain, const CGAL_NP_CLASS& ... nps)
-{
-    return lloyd_optimize_mesh_3(c3t3,domain, internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
 Mesh_optimization_return_code lloyd_optimize_mesh_3(C3T3& c3t3,MeshDomain& domain, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
 {
     return lloyd_optimize_mesh_3(c3t3,domain, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
-
 
 template <typename C3T3, typename MeshDomain>
 Mesh_optimization_return_code
diff --git a/Mesh_3/include/CGAL/make_mesh_3.h b/Mesh_3/include/CGAL/make_mesh_3.h
index 5319c0cf11f..64105159344 100644
--- a/Mesh_3/include/CGAL/make_mesh_3.h
+++ b/Mesh_3/include/CGAL/make_mesh_3.h
@@ -438,20 +438,18 @@ C3T3 make_mesh_3(MeshDomain& domain, MeshCriteria& criteria, const CGAL_NP_CLASS
 }
 
 #ifndef DOXYGEN_RUNNING
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain, typename MeshCriteria, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-C3T3 make_mesh_3(MeshDomain& domain, MeshCriteria& criteria, const CGAL_NP_CLASS& ... nps)
-{
-  return make_mesh_3<C3T3>(domain, criteria, internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain, typename MeshCriteria, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-C3T3 make_mesh_3(MeshDomain& domain, MeshCriteria& criteria, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain, typename MeshCriteria,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+C3T3 make_mesh_3(MeshDomain& domain, MeshCriteria& criteria,
+                 const CGAL_NP_CLASS_1&  np1,
+                 const CGAL_NP_CLASS_2&  np2,
+                 const NP& ... nps)
 {
   return make_mesh_3<C3T3>(domain, criteria, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
-
 
 /**
  * @brief This function meshes the domain defined by mesh_traits
diff --git a/Mesh_3/include/CGAL/odt_optimize_mesh_3.h b/Mesh_3/include/CGAL/odt_optimize_mesh_3.h
index 818de43e49f..5c1d39e36f0 100644
--- a/Mesh_3/include/CGAL/odt_optimize_mesh_3.h
+++ b/Mesh_3/include/CGAL/odt_optimize_mesh_3.h
@@ -143,20 +143,18 @@ Mesh_optimization_return_code odt_optimize_mesh_3(C3T3& c3t3, MeshDomain& domain
 }
 
 #ifndef DOXYGEN_RUNNING
-
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code odt_optimize_mesh_3(C3T3& c3t3, MeshDomain& domain, const CGAL_NP_CLASS& ... nps)
-{
-  return odt_optimize_mesh_3(c3t3, domain, internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code odt_optimize_mesh_3(C3T3& c3t3, MeshDomain& domain, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code odt_optimize_mesh_3(C3T3& c3t3, MeshDomain& domain,
+                                                  const CGAL_NP_CLASS_1&  np1,
+                                                  const CGAL_NP_CLASS_2&  np2,
+                                                  const NP& ... nps)
 {
   return odt_optimize_mesh_3(c3t3, domain, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
 
 template <typename C3T3, typename MeshDomain>
 Mesh_optimization_return_code
diff --git a/Mesh_3/include/CGAL/perturb_mesh_3.h b/Mesh_3/include/CGAL/perturb_mesh_3.h
index 0ecae5d6276..e5be05310df 100644
--- a/Mesh_3/include/CGAL/perturb_mesh_3.h
+++ b/Mesh_3/include/CGAL/perturb_mesh_3.h
@@ -115,19 +115,19 @@ Mesh_optimization_return_code perturb_mesh_3(C3T3& c3t3, MeshDomain& domain, con
 
 
 #ifndef DOXYGEN_RUNNING
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code perturb_mesh_3(C3T3& c3t3, MeshDomain& domain, const CGAL_NP_CLASS& ... nps)
-{
-  return perturb_mesh_3(c3t3,domain, internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code perturb_mesh_3(C3T3& c3t3, MeshDomain& domain, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code perturb_mesh_3(C3T3& c3t3, MeshDomain& domain,
+                                             const CGAL_NP_CLASS_1&  np1,
+                                             const CGAL_NP_CLASS_2&  np2,
+                                             const NP& ... nps)
 {
   return perturb_mesh_3(c3t3,domain, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
+
 template <typename C3T3,
           typename MeshDomain,
           typename SliverCriterion>
diff --git a/Mesh_3/include/CGAL/refine_mesh_3.h b/Mesh_3/include/CGAL/refine_mesh_3.h
index 21b159bd764..94a44676b0c 100644
--- a/Mesh_3/include/CGAL/refine_mesh_3.h
+++ b/Mesh_3/include/CGAL/refine_mesh_3.h
@@ -286,19 +286,18 @@ void refine_mesh_3(C3T3& c3t3, MeshDomain& domain, MeshCriteria& criteria, const
 }
 
 #ifndef DOXYGEN_RUNNING
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain, typename MeshCriteria, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-void refine_mesh_3(C3T3& c3t3, MeshDomain& domain, MeshCriteria& criteria, const CGAL_NP_CLASS& ... nps)
-{
-  return refine_mesh_3(c3t3, domain, criteria, internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain, typename MeshCriteria, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-void refine_mesh_3(C3T3& c3t3, MeshDomain& domain, MeshCriteria& criteria, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain, typename MeshCriteria,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+void refine_mesh_3(C3T3& c3t3, MeshDomain& domain, MeshCriteria& criteria,
+                   const CGAL_NP_CLASS_1&  np1,
+                   const CGAL_NP_CLASS_2&  np2,
+                   const NP& ... nps)
 {
   return refine_mesh_3(c3t3, domain, criteria, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
 /**
  * @brief This function refines the mesh c3t3 wrt domain & criteria
  *
diff --git a/Periodic_3_mesh_3/include/CGAL/make_periodic_3_mesh_3.h b/Periodic_3_mesh_3/include/CGAL/make_periodic_3_mesh_3.h
index f12ed4bc415..2c42a1b9800 100644
--- a/Periodic_3_mesh_3/include/CGAL/make_periodic_3_mesh_3.h
+++ b/Periodic_3_mesh_3/include/CGAL/make_periodic_3_mesh_3.h
@@ -334,19 +334,19 @@ C3T3 make_periodic_3_mesh_3(MeshDomain& domain, MeshCriteria& criteria, const CG
 
 
 #ifndef DOXYGEN_RUNNING
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain, typename MeshCriteria, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-C3T3 make_periodic_3_mesh_3(MeshDomain& domain, MeshCriteria& criteria, const CGAL_NP_CLASS& ... nps)
-{
-  return make_periodic_3_mesh_3<C3T3>(domain, criteria, internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain, typename MeshCriteria, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-C3T3 make_periodic_3_mesh_3(MeshDomain& domain, MeshCriteria& criteria, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain, typename MeshCriteria,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+C3T3 make_periodic_3_mesh_3(MeshDomain& domain, MeshCriteria& criteria,
+                            const CGAL_NP_CLASS_1&  np1,
+                            const CGAL_NP_CLASS_2&  np2,
+                            const NP& ... nps)
 {
   return make_periodic_3_mesh_3<C3T3>(domain, criteria, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
+
 
 /**
  * @brief This function meshes the domain defined by mesh_traits
diff --git a/Periodic_3_mesh_3/include/CGAL/optimize_periodic_3_mesh_3.h b/Periodic_3_mesh_3/include/CGAL/optimize_periodic_3_mesh_3.h
index 7b048c15d9d..ee986ea9c8c 100644
--- a/Periodic_3_mesh_3/include/CGAL/optimize_periodic_3_mesh_3.h
+++ b/Periodic_3_mesh_3/include/CGAL/optimize_periodic_3_mesh_3.h
@@ -45,29 +45,29 @@ Mesh_optimization_return_code perturb_periodic_3_mesh_3(C3T3& c3t3, MeshDomain&
   return perturb_mesh_3_impl(c3t3, domain, time_limit, sliver_criterion, perturbation_vector);
 }
 
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code perturb_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain, const CGAL_NP_CLASS& ... nps)
-{
-  return perturb_periodic_3_mesh_3(c3t3,domain, internal_np::combine_named_parameters(nps...));
-}
-template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code perturb_periodic_3_mesh_3(const CGAL_NP_CLASS& ... nps)
-{
-  return perturb_periodic_3_mesh_3(internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code perturb_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code perturb_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain,
+                                                        const CGAL_NP_CLASS_1&  np1,
+                                                        const CGAL_NP_CLASS_2&  np2,
+                                                        const NP& ... nps)
 {
   return perturb_periodic_3_mesh_3(c3t3,domain, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code perturb_periodic_3_mesh_3(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code perturb_periodic_3_mesh_3(const CGAL_NP_CLASS_1&  np1,
+                                                        const CGAL_NP_CLASS_2&  np2,
+                                                        const NP& ... nps)
 {
   return perturb_periodic_3_mesh_3(internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
+
 // ---------------------------------- exuder -----------------------------------
 /*!
  * \ingroup PkgPeriodic3Mesh3Functions
@@ -95,29 +95,29 @@ Mesh_optimization_return_code exude_periodic_3_mesh_3(C3T3& c3t3,const CGAL_NP_C
   double sliver_bound= choose_parameter(get_parameter(np,internal_np::lower_sliver_bound),parameters::default_values_for_mesh_3::exude_sliver_bound);
   return exude_mesh_3_impl(c3t3,time_limit,sliver_bound);
 }
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code exude_periodic_3_mesh_3(C3T3& c3t3, const CGAL_NP_CLASS& ... nps)
-{
-  return exude_periodic_3_mesh_3(c3t3,internal_np::combine_named_parameters(nps...));
-}
-template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code exude_periodic_3_mesh_3(const CGAL_NP_CLASS& ... nps)
-{
-  return exude_periodic_3_mesh_3(internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code exude_periodic_3_mesh_3(C3T3& c3t3, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code exude_periodic_3_mesh_3(C3T3& c3t3,
+                                                      const CGAL_NP_CLASS_1&  np1,
+                                                      const CGAL_NP_CLASS_2&  np2,
+                                                      const NP& ... nps)
 {
   return exude_periodic_3_mesh_3(c3t3,internal_np::combine_named_parameters(np1, np2, nps...));
 }
-template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code exude_periodic_3_mesh_3(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code exude_periodic_3_mesh_3(const CGAL_NP_CLASS_1&  np1,
+                                                      const CGAL_NP_CLASS_2&  np2,
+                                                      const NP& ... nps)
 {
   return exude_periodic_3_mesh_3(internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
+
 
 
 // ------------------------------ odt optimizer --------------------------------
@@ -143,29 +143,29 @@ Mesh_optimization_return_code odt_optimize_periodic_3_mesh_3(C3T3& c3t3, MeshDom
   return odt_optimize_mesh_3_impl(c3t3, domain, time_limit, max_iteration_number, convergence, freeze_bound, do_freeze);
 }
 
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code odt_optimize_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain, const CGAL_NP_CLASS& ... nps)
-{
-  return odt_optimize_periodic_3_mesh_3(c3t3, domain, internal_np::combine_named_parameters(nps...));
-}
-template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code odt_optimize_periodic_3_mesh_3(const CGAL_NP_CLASS& ... nps)
-{
-  return odt_optimize_periodic_3_mesh_3(internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code odt_optimize_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code odt_optimize_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain,
+                                                             const CGAL_NP_CLASS_1&  np1,
+                                                             const CGAL_NP_CLASS_2&  np2,
+                                                             const NP& ... nps)
 {
   return odt_optimize_periodic_3_mesh_3(c3t3, domain, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code odt_optimize_periodic_3_mesh_3(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code odt_optimize_periodic_3_mesh_3(const CGAL_NP_CLASS_1&  np1,
+                                                             const CGAL_NP_CLASS_2&  np2,
+                                                             const NP& ... nps)
 {
   return odt_optimize_periodic_3_mesh_3(internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
+
 
 // ------------------------------- lloyd optimizer -----------------------------
 /*!
@@ -192,19 +192,19 @@ Mesh_optimization_return_code lloyd_optimize_periodic_3_mesh_3(C3T3& c3t3, MeshD
   return lloyd_optimize_mesh_3_impl(c3t3, domain, time_limit, max_iterations, convergence_ratio, freeze_bound, do_freeze);
 }
 
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain,typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Mesh_optimization_return_code lloyd_optimize_periodic_3_mesh_3(C3T3& c3t3,MeshDomain& domain, const CGAL_NP_CLASS& ... nps)
-{
-  return lloyd_optimize_periodic_3_mesh_3(c3t3,domain, internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain,typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-Mesh_optimization_return_code lloyd_optimize_periodic_3_mesh_3(C3T3& c3t3,MeshDomain& domain, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+Mesh_optimization_return_code lloyd_optimize_periodic_3_mesh_3(C3T3& c3t3,MeshDomain& domain,
+                                                               const CGAL_NP_CLASS_1&  np1,
+                                                               const CGAL_NP_CLASS_2&  np2,
+                                                               const NP& ... nps)
 {
   return lloyd_optimize_periodic_3_mesh_3(c3t3,domain, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
+
 } // namespace CGAL
 
 #endif // CGAL_OPTIMIZE_PERIODIC_3_MESH_3_H
diff --git a/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h b/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h
index b97b2c99604..a26050181ae 100644
--- a/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h
+++ b/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h
@@ -323,19 +323,19 @@ void refine_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain, MeshCriteria& crit
 }
 
 #ifndef DOXYGEN_RUNNING
-#if !defined(BOOST_MSVC)
-template<typename C3T3, typename MeshDomain, typename MeshCriteria, typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-void refine_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain, MeshCriteria& criteria, const CGAL_NP_CLASS& ... nps)
-{
-  return refine_periodic_3_mesh_3(c3t3, domain, criteria, internal_np::combine_named_parameters(nps...));
-}
-#else
-template<typename C3T3, typename MeshDomain, typename MeshCriteria, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
-void refine_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain, MeshCriteria& criteria, const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
+// Overload handling parameters passed with operator=
+template<typename C3T3, typename MeshDomain, typename MeshCriteria,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1,
+         typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2,
+         typename ... NP>
+void refine_periodic_3_mesh_3(C3T3& c3t3, MeshDomain& domain, MeshCriteria& criteria,
+                              const CGAL_NP_CLASS_1&  np1,
+                              const CGAL_NP_CLASS_2&  np2,
+                              const NP& ... nps)
 {
   return refine_periodic_3_mesh_3(c3t3, domain, criteria, internal_np::combine_named_parameters(np1, np2, nps...));
 }
-#endif
+
 /**
  * @brief This function refines the mesh c3t3 wrt domain & criteria
  *
diff --git a/STL_Extension/include/CGAL/STL_Extension/internal/mesh_parameters_interface.h b/STL_Extension/include/CGAL/STL_Extension/internal/mesh_parameters_interface.h
index 5a8e8be90e3..57362801de2 100644
--- a/STL_Extension/include/CGAL/STL_Extension/internal/mesh_parameters_interface.h
+++ b/STL_Extension/include/CGAL/STL_Extension/internal/mesh_parameters_interface.h
@@ -54,11 +54,11 @@ perturb(const CGAL_NP_CLASS& np = parameters::default_values())
   return CGAL_NP_BUILD(Param, options);
 }
 
-template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
-Named_function_parameters<::CGAL::parameters::internal::Perturb_options, ::CGAL::internal_np::perturb_options_param_t, CGAL_NP_BASE>
-perturb(const CGAL_NP_CLASS& ... nps)
+template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
+Named_function_parameters<::CGAL::parameters::internal::Exude_options, ::CGAL::internal_np::exude_options_param_t, CGAL_NP_BASE>
+perturb(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
 {
-  return perturb(::CGAL::internal_np::combine_named_parameters(nps...));
+  return perturb(::CGAL::internal_np::combine_named_parameters(np1, np2, nps...));
 }
 
 
@@ -103,11 +103,11 @@ exude(const CGAL_NP_CLASS& np = parameters::default_values())
   return CGAL_NP_BUILD(Param, options);
 }
 
-template<typename ... CGAL_NP_TEMPLATE_PARAMETERS_VARIADIC>
+template<typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_1, typename CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT_2, typename ... NP>
 Named_function_parameters<::CGAL::parameters::internal::Exude_options, ::CGAL::internal_np::exude_options_param_t, CGAL_NP_BASE>
-exude(const CGAL_NP_CLASS& ... nps)
+exude(const CGAL_NP_CLASS_1&  np1, const CGAL_NP_CLASS_2&  np2, const NP& ... nps)
 {
-  return exude(::CGAL::internal_np::combine_named_parameters(nps...));
+  return exude(::CGAL::internal_np::combine_named_parameters(np1, np2, nps...));
 }
 
 inline Named_function_parameters<::CGAL::parameters::internal::Exude_options, ::CGAL::internal_np::exude_options_param_t, CGAL_NP_BASE>