diff --git a/cpp.hint b/cpp.hint
index e9277f9e..0a481ffe 100644
--- a/cpp.hint
+++ b/cpp.hint
@@ -5,13 +5,13 @@
 #define TOML_TRIVIAL_ABI
 #define TOML_ABSTRACT_BASE
 #define TOML_EMPTY_BASES
-#define TOML_MAY_THROW
 #define TOML_CONSTRAINED_TEMPLATE(cond, ...)	template <__VA_ARGS__>
 #define TOML_LIKELY(...)						(__VA_ARGS__)
 #define TOML_UNLIKELY(...)						(__VA_ARGS__)
 #define TOML_NODISCARD
 #define TOML_NODISCARD_CTOR
 #define TOML_RETURNS_BY_THROWING
+#define TOML_EXTERN_NOEXCEPT(...)
 #define TOML_EXTERNAL_LINKAGE
 #define TOML_INTERNAL_LINKAGE					static
 #define TOML_ANON_NAMESPACE_START				namespace
diff --git a/docs/pages/main_page.dox b/docs/pages/main_page.dox
index 24b19094..9811c2f7 100644
--- a/docs/pages/main_page.dox
+++ b/docs/pages/main_page.dox
@@ -303,18 +303,18 @@
 
  int main()
  {
- 	auto tbl = toml::table{{
+ 	auto tbl = toml::table{
  		{ "lib", "toml++" },
  		{ "cpp", toml::array{ 17, 20, "and beyond" } },
  		{ "toml", toml::array{ "1.0.0", "and beyond" } },
  		{ "repo", "https://github.com/marzer/tomlplusplus/" },
- 		{ "author", toml::table{{
+ 		{ "author", toml::table{
  				{ "name", "Mark Gillard" },
  				{ "github", "https://github.com/marzer" },
  				{ "twitter", "https://twitter.com/marzer8789" }
- 			}}
+ 			}
  		},
- 	}};
+ 	};
 
  	// serializing as TOML
  	std::cout << "###### TOML ######" << "\n\n";
diff --git a/include/toml++/impl/array.h b/include/toml++/impl/array.h
index d27913f8..68ccc870 100644
--- a/include/toml++/impl/array.h
+++ b/include/toml++/impl/array.h
@@ -6,6 +6,7 @@
 
 #include "value.h"
 #include "std_vector.h"
+#include "std_initializer_list.h"
 #include "make_node.h"
 #include "header_start.h"
 
@@ -13,10 +14,10 @@
 TOML_IMPL_NAMESPACE_START
 {
 	template <bool IsConst>
-	class TOML_TRIVIAL_ABI array_iterator final
+	class TOML_TRIVIAL_ABI array_iterator
 	{
 	  private:
-		template <bool C>
+		template <bool>
 		friend class array_iterator;
 		friend class TOML_NAMESPACE::array;
 
@@ -251,10 +252,10 @@ TOML_NAMESPACE_START
 		std::vector<std::unique_ptr<node>> elements;
 
 		TOML_API
-		void preinsertion_resize(size_t idx, size_t count) noexcept;
+		void preinsertion_resize(size_t idx, size_t count);
 
 		template <typename T>
-		void emplace_back_if_not_empty_view(T&& val) noexcept
+		void emplace_back_if_not_empty_view(T&& val)
 		{
 			if constexpr (is_node_view<T>)
 			{
@@ -308,7 +309,7 @@ TOML_NAMESPACE_START
 		/// \brief	Copy constructor.
 		TOML_NODISCARD_CTOR
 		TOML_API
-		array(const array&) noexcept;
+		array(const array&);
 
 		/// \brief	Move constructor.
 		TOML_NODISCARD_CTOR
@@ -317,7 +318,7 @@ TOML_NAMESPACE_START
 
 		/// \brief	Copy-assignment operator.
 		TOML_API
-		array& operator=(const array&) noexcept;
+		array& operator=(const array&);
 
 		/// \brief	Move-assignment operator.
 		TOML_API
@@ -356,7 +357,7 @@ TOML_NAMESPACE_START
 		/// \tparam	ElemTypes	One of the TOML node or value types (or a type promotable to one).
 		/// \param 	val 	The node or value used to initialize element 0.
 		/// \param 	vals	The nodes or values used to initialize elements 1...N.
-		TOML_CONSTRAINED_TEMPLATE((sizeof...(ElemTypes) > 0 || !std::is_same_v<impl::remove_cvref_t<ElemType>, array>),
+		TOML_CONSTRAINED_TEMPLATE((sizeof...(ElemTypes) > 0 || !std::is_same_v<impl::remove_cvref<ElemType>, array>),
 								  typename ElemType,
 								  typename... ElemTypes)
 		TOML_NODISCARD_CTOR
@@ -594,7 +595,7 @@ TOML_NAMESPACE_START
 		/// \attention The return value will always be `end()` if the input value was an empty toml::node_view,
 		/// 		   because no insertion can take place. This is the only circumstance in which this can occur.
 		template <typename ElemType>
-		iterator insert(const_iterator pos, ElemType&& val) noexcept
+		iterator insert(const_iterator pos, ElemType&& val)
 		{
 			if constexpr (is_node_view<ElemType>)
 			{
@@ -642,7 +643,7 @@ TOML_NAMESPACE_START
 		/// \attention The return value will always be `end()` if the input value was an empty toml::node_view,
 		/// 		   because no insertion can take place. This is the only circumstance in which this can occur.
 		template <typename ElemType>
-		iterator insert(const_iterator pos, size_t count, ElemType&& val) noexcept
+		iterator insert(const_iterator pos, size_t count, ElemType&& val)
 		{
 			if constexpr (is_node_view<ElemType>)
 			{
@@ -682,7 +683,7 @@ TOML_NAMESPACE_START
 		/// 		 \conditional_return{All objects in the range were empty toml::node_views}
 		/// 		 A copy of pos
 		template <typename Iter>
-		iterator insert(const_iterator pos, Iter first, Iter last) noexcept
+		iterator insert(const_iterator pos, Iter first, Iter last)
 		{
 			const auto distance = std::distance(first, last);
 			if (distance <= 0)
@@ -732,7 +733,7 @@ TOML_NAMESPACE_START
 		/// 		 \conditional_return{All objects in the list were empty toml::node_views}
 		///			 A copy of pos
 		template <typename ElemType>
-		iterator insert(const_iterator pos, std::initializer_list<ElemType> ilist) noexcept
+		iterator insert(const_iterator pos, std::initializer_list<ElemType> ilist)
 		{
 			return insert(pos, ilist.begin(), ilist.end());
 		}
@@ -762,7 +763,7 @@ TOML_NAMESPACE_START
 		/// \remarks There is no difference between insert() and emplace()
 		/// 		 for trivial value types (floats, ints, bools).
 		template <typename ElemType, typename... Args>
-		iterator emplace(const_iterator pos, Args&&... args) noexcept
+		iterator emplace(const_iterator pos, Args&&... args)
 		{
 			using type = impl::unwrap_node<ElemType>;
 			static_assert((impl::is_native<type> || impl::is_one_of<type, table, array>)&&!impl::is_cvref<type>,
@@ -848,7 +849,7 @@ TOML_NAMESPACE_START
 		/// \param 	new_size			The number of elements the array will have after resizing.
 		/// \param 	default_init_val	The node or value used to initialize new elements if the array needs to grow.
 		template <typename ElemType>
-		void resize(size_t new_size, ElemType&& default_init_val) noexcept
+		void resize(size_t new_size, ElemType&& default_init_val)
 		{
 			static_assert(!is_node_view<ElemType>,
 						  "The default element type argument to toml::array::resize may not be toml::node_view.");
@@ -911,7 +912,7 @@ TOML_NAMESPACE_START
 		/// \attention	No insertion takes place if the input value is an empty toml::node_view.
 		/// 			This is the only circumstance in which this can occur.
 		template <typename ElemType>
-		void push_back(ElemType&& val) noexcept
+		void push_back(ElemType&& val)
 		{
 			emplace_back_if_not_empty_view(static_cast<ElemType&&>(val));
 		}
@@ -938,7 +939,7 @@ TOML_NAMESPACE_START
 		/// \remarks There is no difference between push_back() and emplace_back()
 		/// 		 For trivial value types (floats, ints, bools).
 		template <typename ElemType, typename... Args>
-		decltype(auto) emplace_back(Args&&... args) noexcept
+		decltype(auto) emplace_back(Args&&... args)
 		{
 			using type = impl::unwrap_node<ElemType>;
 			static_assert((impl::is_native<type> || impl::is_one_of<type, table, array>)&&!impl::is_cvref<type>,
diff --git a/include/toml++/impl/array.inl b/include/toml++/impl/array.inl
index 0de65d79..8766dce5 100644
--- a/include/toml++/impl/array.inl
+++ b/include/toml++/impl/array.inl
@@ -43,7 +43,7 @@ TOML_ANON_NAMESPACE_END;
 TOML_NAMESPACE_START
 {
 	TOML_EXTERNAL_LINKAGE
-	array::array(const array& other) noexcept //
+	array::array(const array& other) //
 		: node(other)
 	{
 		elements.reserve(other.elements.size());
@@ -66,7 +66,7 @@ TOML_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	array& array::operator=(const array& rhs) noexcept
+	array& array::operator=(const array& rhs)
 	{
 		if (&rhs != this)
 		{
@@ -91,7 +91,7 @@ TOML_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	void array::preinsertion_resize(size_t idx, size_t count) noexcept
+	void array::preinsertion_resize(size_t idx, size_t count)
 	{
 		TOML_ASSERT(idx <= elements.size());
 		TOML_ASSERT(count >= 1u);
diff --git a/include/toml++/impl/default_formatter.h b/include/toml++/impl/default_formatter.h
index 3ccd6b97..392b295a 100644
--- a/include/toml++/impl/default_formatter.h
+++ b/include/toml++/impl/default_formatter.h
@@ -16,12 +16,12 @@ TOML_NAMESPACE_START
 	/// 		 operators of the TOML node types already print themselves out using this formatter.
 	///
 	/// \detail \cpp
-	/// auto tbl = toml::table{{
+	/// auto tbl = toml::table{
 	///		{ "description", "This is some TOML, yo." },
 	///		{ "fruit", toml::array{ "apple", "orange", "pear" } },
 	///		{ "numbers", toml::array{ 1, 2, 3, 4, 5 } },
-	///		{ "table", toml::table{{ { "foo", "bar" } }} }
-	/// }};
+	///		{ "table", toml::table{ { "foo", "bar" } } }
+	/// };
 	///
 	/// // these two lines are equivalent:
 	///	std::cout << toml::default_formatter{ tbl } << "\n";
diff --git a/include/toml++/impl/forward_declarations.h b/include/toml++/impl/forward_declarations.h
index 0d116539..eae6adc5 100644
--- a/include/toml++/impl/forward_declarations.h
+++ b/include/toml++/impl/forward_declarations.h
@@ -335,7 +335,7 @@ TOML_NAMESPACE_END;
 TOML_IMPL_NAMESPACE_START
 {
 	template <typename T>
-	using remove_cvref_t = std::remove_cv_t<std::remove_reference_t<T>>;
+	using remove_cvref = std::remove_cv_t<std::remove_reference_t<T>>;
 
 	template <typename T, typename... U>
 	inline constexpr bool is_one_of = (false || ... || std::is_same_v<T, U>);
@@ -347,6 +347,14 @@ TOML_IMPL_NAMESPACE_START
 	inline constexpr bool is_wide_string =
 		is_one_of<std::decay_t<T>, const wchar_t*, wchar_t*, std::wstring_view, std::wstring>;
 
+	template <typename T>
+	static constexpr bool value_retrieval_is_nothrow = !std::is_same_v<remove_cvref<T>, std::string>
+#if TOML_HAS_CHAR8
+													&& !std::is_same_v<remove_cvref<T>, std::u8string>
+#endif
+
+													&& !is_wide_string<T>;
+
 	template <typename T>
 	inline constexpr bool dependent_false = false;
 
@@ -767,7 +775,7 @@ TOML_IMPL_NAMESPACE_START
 		static constexpr auto value = node_type::none;
 	};
 	template <typename T>
-	inline constexpr node_type node_type_of = node_type_getter<unwrap_node<remove_cvref_t<T>>>::value;
+	inline constexpr node_type node_type_of = node_type_getter<unwrap_node<remove_cvref<T>>>::value;
 }
 TOML_IMPL_NAMESPACE_END;
 /// \endcond
@@ -776,11 +784,11 @@ TOML_NAMESPACE_START
 {
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a toml::table.
 	template <typename T>
-	inline constexpr bool is_table = std::is_same_v<impl::remove_cvref_t<T>, table>;
+	inline constexpr bool is_table = std::is_same_v<impl::remove_cvref<T>, table>;
 
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a toml::array.
 	template <typename T>
-	inline constexpr bool is_array = std::is_same_v<impl::remove_cvref_t<T>, array>;
+	inline constexpr bool is_array = std::is_same_v<impl::remove_cvref<T>, array>;
 
 	/// \brief	Metafunction for determining if a type satisfies either toml::is_table or toml::is_array.
 	template <typename T>
@@ -788,15 +796,15 @@ TOML_NAMESPACE_START
 
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a std::string or toml::value<std::string>.
 	template <typename T>
-	inline constexpr bool is_string = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<std::string>>;
+	inline constexpr bool is_string = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<std::string>>;
 
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a int64_t or toml::value<int64_t>.
 	template <typename T>
-	inline constexpr bool is_integer = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<int64_t>>;
+	inline constexpr bool is_integer = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<int64_t>>;
 
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a double or toml::value<double>.
 	template <typename T>
-	inline constexpr bool is_floating_point = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<double>>;
+	inline constexpr bool is_floating_point = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<double>>;
 
 	/// \brief	Metafunction for determining if a type satisfies either toml::is_integer or toml::is_floating_point.
 	template <typename T>
@@ -804,19 +812,19 @@ TOML_NAMESPACE_START
 
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a bool or toml::value<bool>.
 	template <typename T>
-	inline constexpr bool is_boolean = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<bool>>;
+	inline constexpr bool is_boolean = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<bool>>;
 
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a toml::date or toml::value<date>.
 	template <typename T>
-	inline constexpr bool is_date = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<date>>;
+	inline constexpr bool is_date = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<date>>;
 
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a toml::time or toml::value<time>.
 	template <typename T>
-	inline constexpr bool is_time = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<time>>;
+	inline constexpr bool is_time = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<time>>;
 
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a toml::date_time or toml::value<date_time>.
 	template <typename T>
-	inline constexpr bool is_date_time = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<date_time>>;
+	inline constexpr bool is_date_time = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<date_time>>;
 
 	/// \brief	Metafunction for determining if a type satisfies any of toml::is_date, toml::is_time or toml::is_date_time.
 	template <typename T>
@@ -829,12 +837,11 @@ TOML_NAMESPACE_START
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a toml::node (or one of its subclasses).
 	template <typename T>
 	inline constexpr bool is_node =
-		std::is_same_v<toml::node, impl::remove_cvref_t<T>> || std::is_base_of_v<toml::node, impl::remove_cvref_t<T>>;
+		std::is_same_v<toml::node, impl::remove_cvref<T>> || std::is_base_of_v<toml::node, impl::remove_cvref<T>>;
 
 	/// \brief	Metafunction for determining if a type is, or is a reference to, a toml::node_view.
 	template <typename T>
-	inline constexpr bool is_node_view =
-		impl::is_one_of<impl::remove_cvref_t<T>, node_view<node>, node_view<const node>>;
+	inline constexpr bool is_node_view = impl::is_one_of<impl::remove_cvref<T>, node_view<node>, node_view<const node>>;
 }
 TOML_NAMESPACE_END;
 
diff --git a/include/toml++/impl/make_node.h b/include/toml++/impl/make_node.h
index 72fbc62d..5727743e 100644
--- a/include/toml++/impl/make_node.h
+++ b/include/toml++/impl/make_node.h
@@ -13,9 +13,9 @@ TOML_IMPL_NAMESPACE_START
 	template <typename T>
 	TOML_NODISCARD
 	TOML_ATTR(returns_nonnull)
-	auto* make_node_specialized(T && val) noexcept
+	auto* make_node_specialized(T && val)
 	{
-		using type = unwrap_node<remove_cvref_t<T>>;
+		using type = unwrap_node<remove_cvref<T>>;
 		static_assert(!std::is_same_v<type, node>);
 		static_assert(!is_node_view<type>);
 
@@ -23,7 +23,7 @@ TOML_IMPL_NAMESPACE_START
 		{
 			return new type{ static_cast<T&&>(val) };
 		}
-		else if constexpr (is_native<type> && !std::is_same_v<remove_cvref_t<T>, type>)
+		else if constexpr (is_native<type> && !std::is_same_v<remove_cvref<T>, type>)
 		{
 			return new value<type>{ static_cast<T&&>(val) };
 		}
@@ -35,7 +35,7 @@ TOML_IMPL_NAMESPACE_START
 			static_assert(is_native<type> || is_losslessly_convertible_to_native<type>,
 						  "Value initializers must be (or be promotable to) one of the TOML value types");
 
-			using value_type = native_type_of<remove_cvref_t<T>>;
+			using value_type = native_type_of<remove_cvref<T>>;
 			if constexpr (is_wide_string<T>)
 			{
 #if TOML_WINDOWS_COMPAT
@@ -51,9 +51,9 @@ TOML_IMPL_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	auto* make_node(T && val) noexcept
+	auto* make_node(T && val)
 	{
-		using type = unwrap_node<remove_cvref_t<T>>;
+		using type = unwrap_node<remove_cvref<T>>;
 		if constexpr (std::is_same_v<type, node> || is_node_view<type>)
 		{
 			if constexpr (is_node_view<type>)
@@ -63,7 +63,7 @@ TOML_IMPL_NAMESPACE_START
 			}
 
 			return static_cast<T&&>(val).visit(
-				[](auto&& concrete) noexcept {
+				[](auto&& concrete) {
 					return static_cast<toml::node*>(make_node_specialized(static_cast<decltype(concrete)&&>(concrete)));
 				});
 		}
@@ -73,7 +73,7 @@ TOML_IMPL_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	auto* make_node(inserter<T> && val) noexcept
+	auto* make_node(inserter<T> && val)
 	{
 		return make_node(static_cast<T&&>(val.value));
 	}
@@ -114,8 +114,7 @@ TOML_NAMESPACE_START
 	/// \note	This will return toml::node for nodes and node_views, even though a more specific node subclass
 	///			would actually be inserted. There is no way around this in a compile-time metafunction.
 	template <typename T>
-	using inserted_type_of =
-		POXY_IMPLEMENTATION_DETAIL(typename impl::inserted_type_of_<impl::remove_cvref_t<T>>::type);
+	using inserted_type_of = POXY_IMPLEMENTATION_DETAIL(typename impl::inserted_type_of_<impl::remove_cvref<T>>::type);
 }
 TOML_NAMESPACE_END;
 
diff --git a/include/toml++/impl/node.h b/include/toml++/impl/node.h
index 017f6e37..f6f3bb01 100644
--- a/include/toml++/impl/node.h
+++ b/include/toml++/impl/node.h
@@ -24,7 +24,7 @@ TOML_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		decltype(auto) get_value_exact() const noexcept;
+		decltype(auto) get_value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>);
 
 		template <typename T, typename N>
 		TOML_NODISCARD
@@ -549,7 +549,7 @@ TOML_NAMESPACE_START
 		/// \see node::value()
 		template <typename T>
 		TOML_NODISCARD
-		optional<T> value_exact() const noexcept;
+		optional<T> value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>);
 
 		/// \brief	Gets the value contained by this node.
 		///
@@ -679,7 +679,7 @@ TOML_NAMESPACE_START
 		/// \see node::value_exact()
 		template <typename T>
 		TOML_NODISCARD
-		optional<T> value() const noexcept;
+		optional<T> value() const noexcept(impl::value_retrieval_is_nothrow<T>);
 
 		/// \brief	Gets the raw value contained by this node, or a default.
 		///
@@ -700,7 +700,7 @@ TOML_NAMESPACE_START
 		///		- node::value_exact()
 		template <typename T>
 		TOML_NODISCARD
-		auto value_or(T&& default_value) const noexcept;
+		auto value_or(T&& default_value) const noexcept(impl::value_retrieval_is_nothrow<T>);
 
 		//# template <typename T>
 		//# TOML_NODISCARD
diff --git a/include/toml++/impl/node_view.h b/include/toml++/impl/node_view.h
index 60dd9591..1f315b37 100644
--- a/include/toml++/impl/node_view.h
+++ b/include/toml++/impl/node_view.h
@@ -7,6 +7,7 @@
 #include "print_to_stream.h"
 #include "node.h"
 #include "std_vector.h"
+#include "std_initializer_list.h"
 #include "header_start.h"
 TOML_DISABLE_ARITHMETIC_WARNINGS;
 
@@ -433,7 +434,7 @@ TOML_NAMESPACE_START
 		/// \see node_view::value()
 		template <typename T>
 		TOML_NODISCARD
-		optional<T> value_exact() const noexcept
+		optional<T> value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>)
 		{
 			if (node_)
 				return node_->template value_exact<T>();
@@ -461,7 +462,7 @@ TOML_NAMESPACE_START
 		///		- node_view::value_exact()
 		template <typename T>
 		TOML_NODISCARD
-		optional<T> value() const noexcept
+		optional<T> value() const noexcept(impl::value_retrieval_is_nothrow<T>)
 		{
 			if (node_)
 				return node_->template value<T>();
@@ -487,7 +488,7 @@ TOML_NAMESPACE_START
 		///		- node_view::value_exact()
 		template <typename T>
 		TOML_NODISCARD
-		auto value_or(T&& default_value) const noexcept
+		auto value_or(T&& default_value) const noexcept(impl::value_retrieval_is_nothrow<T>)
 		{
 			using namespace ::toml::impl;
 
@@ -615,7 +616,7 @@ TOML_NAMESPACE_START
 		/// \brief	Returns true if the viewed node is a value with the same value as RHS.
 		TOML_CONSTRAINED_TEMPLATE((impl::is_native<T> || impl::is_losslessly_convertible_to_native<T>), typename T)
 		TOML_NODISCARD
-		friend bool operator==(const node_view& lhs, const T& rhs) noexcept
+		friend bool operator==(const node_view& lhs, const T& rhs) noexcept(!impl::is_wide_string<T>)
 		{
 			static_assert(!impl::is_wide_string<T> || TOML_WINDOWS_COMPAT,
 						  "Comparison with wide-character strings is only "
@@ -644,7 +645,8 @@ TOML_NAMESPACE_START
 		/// \brief	Returns true if the viewed node is an array with the same contents as the RHS initializer list.
 		template <typename T>
 		TOML_NODISCARD
-		friend bool operator==(const node_view& lhs, const std::initializer_list<T>& rhs) noexcept
+		friend bool operator==(const node_view& lhs,
+							   const std::initializer_list<T>& rhs) noexcept(!impl::is_wide_string<T>)
 		{
 			const auto arr = lhs.as<array>();
 			return arr && *arr == rhs;
@@ -654,7 +656,7 @@ TOML_NAMESPACE_START
 		/// \brief	Returns true if the viewed node is an array with the same contents as the RHS vector.
 		template <typename T>
 		TOML_NODISCARD
-		friend bool operator==(const node_view& lhs, const std::vector<T>& rhs) noexcept
+		friend bool operator==(const node_view& lhs, const std::vector<T>& rhs) noexcept(!impl::is_wide_string<T>)
 		{
 			const auto arr = lhs.as<array>();
 			return arr && *arr == rhs;
@@ -691,7 +693,7 @@ TOML_NAMESPACE_START
 		/// \returns	A view of the selected node if this node represented a table and it contained a
 		/// 			value at the given key, or an empty view.
 		TOML_NODISCARD
-		node_view operator[](std::wstring_view key) const noexcept
+		node_view operator[](std::wstring_view key) const
 		{
 			if (auto tbl = this->as_table())
 				return node_view{ tbl->get(key) };
@@ -746,9 +748,9 @@ TOML_NAMESPACE_START
 
 #define TOML_EXTERN(name, T)                                                                                           \
 	extern template TOML_API                                                                                           \
-	optional<T> node_view<node>::name<T>() const noexcept;                                                             \
+	optional<T> node_view<node>::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>);            \
 	extern template TOML_API                                                                                           \
-	optional<T> node_view<const node>::name<T>() const noexcept
+	optional<T> node_view<const node>::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>)
 
 	TOML_EXTERN(value_exact, std::string_view);
 	TOML_EXTERN(value_exact, std::string);
diff --git a/include/toml++/impl/node_view.inl b/include/toml++/impl/node_view.inl
index 85f6a51b..4b73d80f 100644
--- a/include/toml++/impl/node_view.inl
+++ b/include/toml++/impl/node_view.inl
@@ -22,8 +22,9 @@ TOML_NAMESPACE_START
 	template class node_view<const node>;
 
 #define TOML_EXTERN(name, T)                                                                                           \
-	template optional<T> node_view<node>::name<T>() const noexcept;                                                    \
-	template optional<T> node_view<const node>::name<T>() const noexcept
+	template optional<T> node_view<node>::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>);   \
+	template optional<T> node_view<const node>::name<T>()                                                              \
+		const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>)
 
 	TOML_EXTERN(value_exact, std::string_view);
 	TOML_EXTERN(value_exact, std::string);
diff --git a/include/toml++/impl/parse_result.h b/include/toml++/impl/parse_result.h
index cb4121d1..7504fffa 100644
--- a/include/toml++/impl/parse_result.h
+++ b/include/toml++/impl/parse_result.h
@@ -47,7 +47,7 @@ TOML_NAMESPACE_START
 	/// #if TOML_EXCEPTIONS
 	///		using parse_result = table;
 	/// #else
-	///		class parse_result final { // ...
+	///		class parse_result { // ...
 	///	#endif
 	/// \ecpp
 	class parse_result
diff --git a/include/toml++/impl/parser.h b/include/toml++/impl/parser.h
index 3ebf327c..c565d181 100644
--- a/include/toml++/impl/parser.h
+++ b/include/toml++/impl/parser.h
@@ -38,7 +38,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::string_view doc, std::string_view source_path = {}) TOML_MAY_THROW;
+	parse_result parse(std::string_view doc, std::string_view source_path = {});
 
 	/// \brief	Parses a TOML document from a string view.
 	///
@@ -63,7 +63,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::string_view doc, std::string && source_path) TOML_MAY_THROW;
+	parse_result parse(std::string_view doc, std::string && source_path);
 
 	/// \brief	Parses a TOML document from a file.
 	///
@@ -82,7 +82,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse_file(std::string_view file_path) TOML_MAY_THROW;
+	parse_result parse_file(std::string_view file_path);
 
 #if TOML_HAS_CHAR8
 
@@ -109,7 +109,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::u8string_view doc, std::string_view source_path = {}) TOML_MAY_THROW;
+	parse_result parse(std::u8string_view doc, std::string_view source_path = {});
 
 	/// \brief	Parses a TOML document from a char8_t string view.
 	///
@@ -134,7 +134,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::u8string_view doc, std::string && source_path) TOML_MAY_THROW;
+	parse_result parse(std::u8string_view doc, std::string && source_path);
 
 	/// \brief	Parses a TOML document from a file.
 	///
@@ -153,7 +153,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse_file(std::u8string_view file_path) TOML_MAY_THROW;
+	parse_result parse_file(std::u8string_view file_path);
 
 #endif // TOML_HAS_CHAR8
 
@@ -184,7 +184,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::string_view doc, std::wstring_view source_path) TOML_MAY_THROW;
+	parse_result parse(std::string_view doc, std::wstring_view source_path);
 
 	/// \brief	Parses a TOML document from a stream.
 	///
@@ -214,7 +214,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::istream & doc, std::wstring_view source_path) TOML_MAY_THROW;
+	parse_result parse(std::istream & doc, std::wstring_view source_path);
 
 	/// \brief	Parses a TOML document from a file.
 	///
@@ -235,7 +235,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse_file(std::wstring_view file_path) TOML_MAY_THROW;
+	parse_result parse_file(std::wstring_view file_path);
 
 #endif // TOML_WINDOWS_COMPAT
 
@@ -265,7 +265,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::u8string_view doc, std::wstring_view source_path) TOML_MAY_THROW;
+	parse_result parse(std::u8string_view doc, std::wstring_view source_path);
 
 #endif // TOML_HAS_CHAR8 && TOML_WINDOWS_COMPAT
 
@@ -295,7 +295,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::istream & doc, std::string_view source_path = {}) TOML_MAY_THROW;
+	parse_result parse(std::istream & doc, std::string_view source_path = {});
 
 	/// \brief	Parses a TOML document from a stream.
 	///
@@ -323,7 +323,7 @@ TOML_NAMESPACE_START
 	///				A toml::parse_result.
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::istream & doc, std::string && source_path) TOML_MAY_THROW;
+	parse_result parse(std::istream & doc, std::string && source_path);
 
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
@@ -353,7 +353,7 @@ TOML_NAMESPACE_START
 		/// 			\conditional_return{Without exceptions}
 		///				A toml::parse_result.
 		TOML_NODISCARD
-		inline parse_result operator"" _toml(const char* str, size_t len) TOML_MAY_THROW
+		inline parse_result operator"" _toml(const char* str, size_t len)
 		{
 			return parse(std::string_view{ str, len });
 		}
@@ -382,7 +382,7 @@ TOML_NAMESPACE_START
 		/// 			\conditional_return{Without exceptions}
 		///				A toml::parse_result.
 		TOML_NODISCARD
-		inline parse_result operator"" _toml(const char8_t* str, size_t len) TOML_MAY_THROW
+		inline parse_result operator"" _toml(const char8_t* str, size_t len)
 		{
 			return parse(std::u8string_view{ str, len });
 		}
diff --git a/include/toml++/impl/parser.inl b/include/toml++/impl/parser.inl
index 0a77b533..4a3a4a5d 100644
--- a/include/toml++/impl/parser.inl
+++ b/include/toml++/impl/parser.inl
@@ -169,7 +169,7 @@ TOML_ANON_NAMESPACE_START
 		}
 	};
 
-	struct utf8_codepoint final
+	struct utf8_codepoint
 	{
 		char32_t value;
 		char bytes[4];
@@ -603,14 +603,14 @@ TOML_ANON_NAMESPACE_START
 	TOML_NEVER_INLINE
 	void concatenate(char*& write_pos, char* const buf_end, const T& arg) noexcept
 	{
-		static_assert(impl::is_one_of<impl::remove_cvref_t<T>, std::string_view, int64_t, uint64_t, double>,
+		static_assert(impl::is_one_of<impl::remove_cvref<T>, std::string_view, int64_t, uint64_t, double>,
 					  "concatenate inputs are limited to std::string_view, int64_t, uint64_t and double to keep "
 					  "instantiations to a minimum as an anti-bloat measure (hint: to_sv will probably help)");
 
 		if (write_pos >= buf_end)
 			return;
 
-		using arg_t = impl::remove_cvref_t<T>;
+		using arg_t = impl::remove_cvref<T>;
 		if constexpr (std::is_same_v<arg_t, std::string_view>)
 		{
 			const auto max_chars = static_cast<size_t>(buf_end - write_pos);
@@ -668,7 +668,7 @@ TOML_ANON_NAMESPACE_START
 		}
 
 		TOML_RETURNS_BY_THROWING
-		auto finish(const source_position& pos, const source_path_ptr& source_path) const TOML_MAY_THROW
+		auto finish(const source_position& pos, const source_path_ptr& source_path) const
 		{
 			*write_pos = '\0';
 
@@ -964,7 +964,7 @@ TOML_IMPL_NAMESPACE_START
 		template <typename... T>
 		TOML_RETURNS_BY_THROWING
 		TOML_NEVER_INLINE
-		void set_error_at(source_position pos, const T&... reason) const TOML_MAY_THROW
+		void set_error_at(source_position pos, const T&... reason) const
 		{
 			static_assert(sizeof...(T) > 0);
 #if !TOML_EXCEPTIONS
@@ -986,7 +986,7 @@ TOML_IMPL_NAMESPACE_START
 
 		template <typename... T>
 		TOML_RETURNS_BY_THROWING
-		void set_error(const T&... reason) const TOML_MAY_THROW
+		void set_error(const T&... reason) const
 		{
 			set_error_at(current_position(1), reason...);
 		}
@@ -1000,7 +1000,7 @@ TOML_IMPL_NAMESPACE_START
 			prev_pos = cp->position;
 		}
 
-		void advance() TOML_MAY_THROW
+		void advance()
 		{
 			return_if_error();
 			assert_not_eof();
@@ -1052,7 +1052,7 @@ TOML_IMPL_NAMESPACE_START
 			}
 		}
 
-		bool consume_leading_whitespace() TOML_MAY_THROW
+		bool consume_leading_whitespace()
 		{
 			return_if_error_or_eof({});
 
@@ -1065,7 +1065,7 @@ TOML_IMPL_NAMESPACE_START
 			return consumed;
 		}
 
-		bool consume_line_break() TOML_MAY_THROW
+		bool consume_line_break()
 		{
 			return_if_error_or_eof({});
 
@@ -1085,7 +1085,7 @@ TOML_IMPL_NAMESPACE_START
 			return true;
 		}
 
-		bool consume_rest_of_line() TOML_MAY_THROW
+		bool consume_rest_of_line()
 		{
 			return_if_error_or_eof({});
 
@@ -1102,7 +1102,7 @@ TOML_IMPL_NAMESPACE_START
 			return true;
 		}
 
-		bool consume_comment() TOML_MAY_THROW
+		bool consume_comment()
 		{
 			return_if_error_or_eof({});
 
@@ -1138,7 +1138,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		bool consume_expected_sequence(std::u32string_view seq) TOML_MAY_THROW
+		bool consume_expected_sequence(std::u32string_view seq)
 		{
 			return_if_error({});
 			TOML_ASSERT(!seq.empty());
@@ -1155,7 +1155,7 @@ TOML_IMPL_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		bool consume_digit_sequence(T* digits, size_t len) TOML_MAY_THROW
+		bool consume_digit_sequence(T* digits, size_t len)
 		{
 			return_if_error({});
 			assert_or_assume(digits);
@@ -1175,7 +1175,7 @@ TOML_IMPL_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		size_t consume_variable_length_digit_sequence(T* buffer, size_t max_len) TOML_MAY_THROW
+		size_t consume_variable_length_digit_sequence(T* buffer, size_t max_len)
 		{
 			return_if_error({});
 			assert_or_assume(buffer);
@@ -1195,7 +1195,7 @@ TOML_IMPL_NAMESPACE_START
 
 		// template <bool MultiLine>
 		TOML_NODISCARD
-		std::string parse_basic_string(bool multi_line) TOML_MAY_THROW
+		std::string parse_basic_string(bool multi_line)
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -1422,7 +1422,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		std::string parse_literal_string(bool multi_line) TOML_MAY_THROW
+		std::string parse_literal_string(bool multi_line)
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -1525,7 +1525,7 @@ TOML_IMPL_NAMESPACE_START
 
 		TOML_NODISCARD
 		TOML_NEVER_INLINE
-		parsed_string parse_string() TOML_MAY_THROW
+		parsed_string parse_string()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -1568,7 +1568,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		std::string parse_bare_key_segment() TOML_MAY_THROW
+		std::string parse_bare_key_segment()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -1589,7 +1589,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		bool parse_boolean() TOML_MAY_THROW
+		bool parse_boolean()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -1613,7 +1613,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		double parse_inf_or_nan() TOML_MAY_THROW
+		double parse_inf_or_nan()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -1642,7 +1642,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		double parse_float() TOML_MAY_THROW
+		double parse_float()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -1797,7 +1797,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		double parse_hex_float() TOML_MAY_THROW
+		double parse_hex_float()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -1973,7 +1973,7 @@ TOML_IMPL_NAMESPACE_START
 
 		template <uint64_t base>
 		TOML_NODISCARD
-		int64_t parse_integer() TOML_MAY_THROW
+		int64_t parse_integer()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -2092,7 +2092,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		date parse_date(bool part_of_datetime = false) TOML_MAY_THROW
+		date parse_date(bool part_of_datetime = false)
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -2146,7 +2146,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		time parse_time(bool part_of_datetime = false) TOML_MAY_THROW
+		time parse_time(bool part_of_datetime = false)
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -2240,7 +2240,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		date_time parse_date_time() TOML_MAY_THROW
+		date_time parse_date_time()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -2310,13 +2310,13 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		array* parse_array() TOML_MAY_THROW;
+		array* parse_array();
 
 		TOML_NODISCARD
-		table* parse_inline_table() TOML_MAY_THROW;
+		table* parse_inline_table();
 
 		TOML_NODISCARD
-		node* parse_value_known_prefixes() TOML_MAY_THROW
+		node* parse_value_known_prefixes()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -2358,7 +2358,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		node* parse_value() TOML_MAY_THROW
+		node* parse_value()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -2444,7 +2444,7 @@ TOML_IMPL_NAMESPACE_START
 				char32_t chars[utf8_buffered_reader::max_history_length];
 				size_t char_count = {}, advance_count = {};
 				bool eof_while_scanning = false;
-				const auto scan			= [&]() TOML_MAY_THROW
+				const auto scan			= [&]()
 				{
 					if (is_eof())
 						return;
@@ -2832,7 +2832,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		parsed_key parse_key() TOML_MAY_THROW
+		parsed_key parse_key()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -2901,7 +2901,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		parsed_key_value_pair parse_key_value_pair() TOML_MAY_THROW
+		parsed_key_value_pair parse_key_value_pair()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -2934,7 +2934,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		table* parse_table_header() TOML_MAY_THROW
+		table* parse_table_header()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -3125,7 +3125,7 @@ TOML_IMPL_NAMESPACE_START
 			}
 		}
 
-		void parse_key_value_pair_and_insert(table* tab) TOML_MAY_THROW
+		void parse_key_value_pair_and_insert(table* tab)
 		{
 			return_if_error();
 			assert_not_eof();
@@ -3189,7 +3189,7 @@ TOML_IMPL_NAMESPACE_START
 			tab->map_.emplace(std::move(kvp.key.segments.back()), std::unique_ptr<node>{ kvp.value.release() });
 		}
 
-		void parse_document() TOML_MAY_THROW
+		void parse_document()
 		{
 			assert_not_error();
 			assert_not_eof();
@@ -3275,7 +3275,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 	  public:
-		parser(utf8_reader_interface&& reader_) TOML_MAY_THROW : reader{ reader_ }
+		parser(utf8_reader_interface&& reader_) : reader{ reader_ }
 		{
 			root.source_ = { prev_pos, prev_pos, reader.source_path() };
 
@@ -3317,7 +3317,7 @@ TOML_IMPL_NAMESPACE_START
 	};
 
 	TOML_EXTERNAL_LINKAGE
-	array* parser::parse_array() TOML_MAY_THROW
+	array* parser::parse_array()
 	{
 		return_if_error({});
 		assert_not_eof();
@@ -3380,7 +3380,7 @@ TOML_IMPL_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	table* parser::parse_inline_table() TOML_MAY_THROW
+	table* parser::parse_inline_table()
 	{
 		return_if_error({});
 		assert_not_eof();
@@ -3495,14 +3495,14 @@ TOML_ANON_NAMESPACE_START
 {
 	TOML_NODISCARD
 	TOML_INTERNAL_LINKAGE
-	parse_result do_parse(utf8_reader_interface && reader) TOML_MAY_THROW
+	parse_result do_parse(utf8_reader_interface && reader)
 	{
 		return impl::parser{ std::move(reader) };
 	}
 
 	TOML_NODISCARD
 	TOML_INTERNAL_LINKAGE
-	parse_result do_parse_file(std::string_view file_path) TOML_MAY_THROW
+	parse_result do_parse_file(std::string_view file_path)
 	{
 #if TOML_EXCEPTIONS
 #define TOML_PARSE_FILE_ERROR(msg, path)                                                                               \
@@ -3561,31 +3561,31 @@ TOML_NAMESPACE_START
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex);
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::string_view doc, std::string_view source_path) TOML_MAY_THROW
+	parse_result parse(std::string_view doc, std::string_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, source_path });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::string_view doc, std::string && source_path) TOML_MAY_THROW
+	parse_result parse(std::string_view doc, std::string && source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, std::move(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::istream & doc, std::string_view source_path) TOML_MAY_THROW
+	parse_result parse(std::istream & doc, std::string_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, source_path });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::istream & doc, std::string && source_path) TOML_MAY_THROW
+	parse_result parse(std::istream & doc, std::string && source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, std::move(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse_file(std::string_view file_path) TOML_MAY_THROW
+	parse_result parse_file(std::string_view file_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse_file(file_path);
 	}
@@ -3593,19 +3593,19 @@ TOML_NAMESPACE_START
 #if TOML_HAS_CHAR8
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::u8string_view doc, std::string_view source_path) TOML_MAY_THROW
+	parse_result parse(std::u8string_view doc, std::string_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, source_path });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::u8string_view doc, std::string && source_path) TOML_MAY_THROW
+	parse_result parse(std::u8string_view doc, std::string && source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, std::move(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse_file(std::u8string_view file_path) TOML_MAY_THROW
+	parse_result parse_file(std::u8string_view file_path)
 	{
 		std::string file_path_str;
 		file_path_str.resize(file_path.length());
@@ -3618,19 +3618,19 @@ TOML_NAMESPACE_START
 #if TOML_WINDOWS_COMPAT
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::string_view doc, std::wstring_view source_path) TOML_MAY_THROW
+	parse_result parse(std::string_view doc, std::wstring_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, impl::narrow(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::istream & doc, std::wstring_view source_path) TOML_MAY_THROW
+	parse_result parse(std::istream & doc, std::wstring_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, impl::narrow(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse_file(std::wstring_view file_path) TOML_MAY_THROW
+	parse_result parse_file(std::wstring_view file_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse_file(impl::narrow(file_path));
 	}
@@ -3640,7 +3640,7 @@ TOML_NAMESPACE_START
 #if TOML_HAS_CHAR8 && TOML_WINDOWS_COMPAT
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::u8string_view doc, std::wstring_view source_path) TOML_MAY_THROW
+	parse_result parse(std::u8string_view doc, std::wstring_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, impl::narrow(source_path) });
 	}
diff --git a/include/toml++/impl/preprocessor.h b/include/toml++/impl/preprocessor.h
index 0692289d..0a958d00 100644
--- a/include/toml++/impl/preprocessor.h
+++ b/include/toml++/impl/preprocessor.h
@@ -331,18 +331,26 @@
 #endif
  
 #ifdef DOXYGEN
-	#define TOML_HEADER_ONLY 0
+	#undef TOML_WINDOWS_COMPAT
 	#define TOML_WINDOWS_COMPAT 1
 #endif
 
-#if defined(TOML_ALL_INLINE) && !defined(TOML_HEADER_ONLY)
-	#define TOML_HEADER_ONLY	TOML_ALL_INLINE
-#endif
-
 #if !defined(TOML_HEADER_ONLY) || (defined(TOML_HEADER_ONLY) && TOML_HEADER_ONLY) || TOML_INTELLISENSE
 	#undef TOML_HEADER_ONLY
 	#define TOML_HEADER_ONLY 1
 #endif
+#ifdef DOXYGEN
+	#undef TOML_HEADER_ONLY
+	#define TOML_HEADER_ONLY 0
+#endif
+
+#ifndef TOML_EXTERN_TEMPLATES
+	#define TOML_EXTERN_TEMPLATES 1
+#endif
+#if (defined(DOXYGEN) || TOML_HEADER_ONLY) && !TOML_INTELLISENSE
+	#undef TOML_EXTERN_TEMPLATES
+	#define TOML_EXTERN_TEMPLATES 0
+#endif
 
 #if defined(TOML_IMPLEMENTATION) || TOML_HEADER_ONLY
 	#undef TOML_IMPLEMENTATION
@@ -367,7 +375,8 @@
 	#define TOML_UNDEF_MACROS 1
 #endif
 
-#ifndef TOML_PARSER
+#if !defined(TOML_PARSER) || (defined(TOML_PARSER) && TOML_PARSER) || TOML_INTELLISENSE
+	#undef TOML_PARSER
 	#define TOML_PARSER 1
 #endif
 
@@ -377,7 +386,8 @@
 	// 256 is crazy high! if you're hitting this limit with real input, TOML is probably the wrong tool for the job...
 #endif
 
-#ifndef TOML_WINDOWS_COMPAT
+#if !defined(TOML_WINDOWS_COMPAT) || (defined(TOML_WINDOWS_COMPAT) && TOML_WINDOWS_COMPAT) || TOML_INTELLISENSE
+	#undef TOML_WINDOWS_COMPAT
 	#define TOML_WINDOWS_COMPAT 1
 #endif
 /// \cond
@@ -408,6 +418,10 @@
 	#endif
 #endif
 
+#ifdef TOML_ALL_INLINE
+	#error Support for TOML_ALL_INLINE was deprecated in toml++ 2.0.0 and removed in 3.0.0. Use TOML_HEADER_ONLY instead.
+#endif
+
 //#====================================================================================================================
 //# ATTRIBUTES, UTILITY MACROS ETC
 //#====================================================================================================================
@@ -450,12 +464,6 @@
 	#define TOML_EXCEPTIONS	0
 #endif
 
-#if defined(DOXYGEN) || TOML_EXCEPTIONS
-	#define TOML_MAY_THROW
-#else
-	#define TOML_MAY_THROW				noexcept
-#endif
-
 #if TOML_GCC || TOML_CLANG || (TOML_ICC && !TOML_ICC_CL)
 	// not supported by any version of GCC or Clang as of 26/11/2020
 	// not supported by any version of ICC on Linux as of 11/01/2021
@@ -636,10 +644,10 @@
 	#define POXY_IMPLEMENTATION_DETAIL(...) __VA_ARGS__
 #endif
 
-#if (!defined(DOXYGEN) && !TOML_HEADER_ONLY) || TOML_INTELLISENSE
-	#define TOML_EXTERN_TEMPLATES 1
+#if TOML_CLANG
+	#define TOML_EXTERN_NOEXCEPT(...)
 #else
-	#define TOML_EXTERN_TEMPLATES 0
+	#define TOML_EXTERN_NOEXCEPT(...) noexcept(__VA_ARGS__)
 #endif
 
 //======================================================================================================================
diff --git a/include/toml++/impl/std_initializer_list.h b/include/toml++/impl/std_initializer_list.h
new file mode 100644
index 00000000..510d1fe5
--- /dev/null
+++ b/include/toml++/impl/std_initializer_list.h
@@ -0,0 +1,10 @@
+//# This file is a part of toml++ and is subject to the the terms of the MIT license.
+//# Copyright (c) Mark Gillard <mark.gillard@outlook.com.au>
+//# See https://github.com/marzer/tomlplusplus/blob/master/LICENSE for the full license text.
+// SPDX-License-Identifier: MIT
+#pragma once
+
+#include "preprocessor.h"
+TOML_DISABLE_WARNINGS;
+#include <initializer_list>
+TOML_ENABLE_WARNINGS;
diff --git a/include/toml++/impl/std_string.h b/include/toml++/impl/std_string.h
index 0cca99be..6ece185b 100644
--- a/include/toml++/impl/std_string.h
+++ b/include/toml++/impl/std_string.h
@@ -37,17 +37,17 @@ TOML_IMPL_NAMESPACE_START
 {
 	TOML_NODISCARD
 	TOML_API
-	std::string narrow(std::wstring_view) noexcept;
+	std::string narrow(std::wstring_view);
 
 	TOML_NODISCARD
 	TOML_API
-	std::wstring widen(std::string_view) noexcept;
+	std::wstring widen(std::string_view);
 
 #if TOML_HAS_CHAR8
 
 	TOML_NODISCARD
 	TOML_API
-	std::wstring widen(std::u8string_view) noexcept;
+	std::wstring widen(std::u8string_view);
 
 #endif
 }
diff --git a/include/toml++/impl/std_string.inl b/include/toml++/impl/std_string.inl
index 57520cbf..0fe9aaf2 100644
--- a/include/toml++/impl/std_string.inl
+++ b/include/toml++/impl/std_string.inl
@@ -42,7 +42,7 @@ extern "C" __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int
 TOML_IMPL_NAMESPACE_START
 {
 	TOML_EXTERNAL_LINKAGE
-	std::string narrow(std::wstring_view str) noexcept
+	std::string narrow(std::wstring_view str)
 	{
 		if (str.empty())
 			return {};
@@ -66,7 +66,7 @@ TOML_IMPL_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	std::wstring widen(std::string_view str) noexcept
+	std::wstring widen(std::string_view str)
 	{
 		if (str.empty())
 			return {};
@@ -84,7 +84,7 @@ TOML_IMPL_NAMESPACE_START
 #if TOML_HAS_CHAR8
 
 	TOML_EXTERNAL_LINKAGE
-	std::wstring widen(std::u8string_view str) noexcept
+	std::wstring widen(std::u8string_view str)
 	{
 		if (str.empty())
 			return {};
diff --git a/include/toml++/impl/table.h b/include/toml++/impl/table.h
index 8e1c9bff..3fb7aa76 100644
--- a/include/toml++/impl/table.h
+++ b/include/toml++/impl/table.h
@@ -7,6 +7,7 @@
 #include "array.h"
 #include "make_node.h"
 #include "std_map.h"
+#include "std_initializer_list.h"
 #include "node_view.h"
 #include "header_start.h"
 
@@ -14,7 +15,7 @@
 TOML_IMPL_NAMESPACE_START
 {
 	template <bool IsConst>
-	struct table_proxy_pair final
+	struct table_proxy_pair
 	{
 		using value_type = std::conditional_t<IsConst, const node, node>;
 
@@ -23,10 +24,10 @@ TOML_IMPL_NAMESPACE_START
 	};
 
 	template <bool IsConst>
-	class table_iterator final
+	class table_iterator
 	{
 	  private:
-		template <bool C>
+		template <bool>
 		friend class table_iterator;
 		friend class TOML_NAMESPACE::table;
 
@@ -151,28 +152,28 @@ TOML_IMPL_NAMESPACE_START
 		TOML_ENABLE_WARNINGS;
 	};
 
-	struct table_init_pair final
+	struct table_init_pair
 	{
-		std::string key;
-		std::unique_ptr<node> value;
+		mutable std::string key;
+		mutable std::unique_ptr<node> value;
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(std::string&& k, V&& v) noexcept //
+		table_init_pair(std::string&& k, V&& v) //
 			: key{ std::move(k) },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(std::string_view k, V&& v) noexcept //
+		table_init_pair(std::string_view k, V&& v) //
 			: key{ k },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(const char* k, V&& v) noexcept //
+		table_init_pair(const char* k, V&& v) //
 			: key{ k },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
@@ -181,21 +182,21 @@ TOML_IMPL_NAMESPACE_START
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(std::wstring&& k, V&& v) noexcept //
+		table_init_pair(std::wstring&& k, V&& v) //
 			: key{ narrow(k) },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(std::wstring_view k, V&& v) noexcept //
+		table_init_pair(std::wstring_view k, V&& v) //
 			: key{ narrow(k) },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(const wchar_t* k, V&& v) noexcept //
+		table_init_pair(const wchar_t* k, V&& v) //
 			: key{ narrow(std::wstring_view{ k }) },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
@@ -232,11 +233,11 @@ TOML_NAMESPACE_START
 
 		TOML_NODISCARD_CTOR
 		TOML_API
-		table(impl::table_init_pair*, size_t) noexcept;
+		table(const impl::table_init_pair*, const impl::table_init_pair*);
 
 		template <typename Map, typename Key>
 		TOML_NODISCARD
-		static auto do_get(Map& vals, const Key& key) noexcept
+		static auto do_get(Map& vals, const Key& key) noexcept(!impl::is_wide_string<Key>)
 			-> std::conditional_t<std::is_const_v<Map>, const node*, node*>
 		{
 			static_assert(
@@ -307,29 +308,21 @@ TOML_NAMESPACE_START
 		/// \brief	Copy constructor.
 		TOML_NODISCARD_CTOR
 		TOML_API
-		table(const table&) noexcept;
+		table(const table&);
 
 		/// \brief	Move constructor.
 		TOML_NODISCARD_CTOR
 		TOML_API
 		table(table&& other) noexcept;
 
-		/// \brief	Copy-assignment operator.
-		TOML_API
-		table& operator=(const table&) noexcept;
-
-		/// \brief	Move-assignment operator.
-		TOML_API
-		table& operator=(table&& rhs) noexcept;
-
 		/// \brief	Constructs a table with one or more initial key-value pairs.
 		///
 		/// \detail \cpp
-		/// auto tbl = toml::table{{ // double braces required :( - see remark
+		/// auto tbl = toml::table{
 		///		{ "foo", 1 },
 		///		{ "bar", 2.0 },
 		///		{ "kek", "three" }
-		///	}};
+		///	};
 		/// std::cout << tbl << "\n";
 		///
 		/// \ecpp
@@ -338,28 +331,19 @@ TOML_NAMESPACE_START
 		/// { foo = 1, bar = 2.0, kek = "three" }
 		/// \eout
 		///
-		/// \tparam	N	Number of key-value pairs used to initialize the table.
-		/// \param 	arr	An array of key-value pairs used to initialize the table.
-		///
-		/// \remarks C++ std::initializer_lists represent their member elements as
-		/// 		 const even if the list's value type is non-const. This is great for
-		/// 		 compiler writers, I guess, but pretty annoying for me since
-		/// 		 TOML key-value pairs are polymorphic (and thus move-only). This means
-		/// 		 that for the human-friendly braced init list syntax to work I can't use
-		/// 		 std::initializer_list and must instead invent an annoying proxy type,
-		/// 		 which means an extra level of nesting.
-		/// 		 <br><br>
-		/// 		 See https://en.cppreference.com/w/cpp/utility/initializer_list
-		/// 		 if you'd like to learn more about this.
-		template <size_t N>
+		/// \param 	kvps	A list of key-value pairs used to initialize the table.
 		TOML_NODISCARD_CTOR
-		explicit table(impl::table_init_pair(&&arr)[N]) noexcept //
-			: table{ arr, N }
-		{
-#if TOML_LIFETIME_HOOKS
-			TOML_TABLE_CREATED;
-#endif
-		}
+		explicit table(std::initializer_list<impl::table_init_pair> kvps) //
+			: table{ kvps.begin(), kvps.end() }
+		{}
+
+		/// \brief	Copy-assignment operator.
+		TOML_API
+		table& operator=(const table&);
+
+		/// \brief	Move-assignment operator.
+		TOML_API
+		table& operator=(table&& rhs) noexcept;
 
 		/// \name Type checks
 		/// @{
@@ -440,12 +424,12 @@ TOML_NAMESPACE_START
 		/// \detail \godbolt{an9xdj}
 		///
 		/// \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 1 },
 		///		{ "b", 2 },
 		///		{ "c", 3 },
-		///		{ "d", toml::table{{ { "e", 4 } }} }
-		///	}};
+		///		{ "d", toml::table{ { "e", 4 } } }
+		///	};
 		/// std::cout << "is inline? "sv << tbl.is_inline() << "\n";
 		/// std::cout << tbl << "\n\n";
 		///
@@ -632,11 +616,11 @@ TOML_NAMESPACE_START
 		/// \detail \godbolt{bMnW5r}
 		///
 		/// \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 1 },
 		///		{ "b", 2 },
 		///		{ "c", 3 }
-		///	}};
+		///	};
 		/// std::cout << tbl << "\n";
 		///
 		/// for (auto k : { "a", "d" })
@@ -681,7 +665,7 @@ TOML_NAMESPACE_START
 		TOML_CONSTRAINED_TEMPLATE((std::is_convertible_v<KeyType&&, std::string_view> || impl::is_wide_string<KeyType>),
 								  typename KeyType,
 								  typename ValueType)
-		std::pair<iterator, bool> insert(KeyType&& key, ValueType&& val) noexcept
+		std::pair<iterator, bool> insert(KeyType&& key, ValueType&& val)
 		{
 			static_assert(
 				!impl::is_wide_string<KeyType> || TOML_WINDOWS_COMPAT,
@@ -720,11 +704,11 @@ TOML_NAMESPACE_START
 		/// \detail \godbolt{bzYcce}
 		///
 		/// \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 1 },
 		///		{ "b", 2 },
 		///		{ "c", 3 }
-		///	}};
+		///	};
 		/// std::cout << tbl << "\n";
 		///
 		/// auto kvps = std::array<std::pair<std::string, int>, 2>{{
@@ -756,7 +740,7 @@ TOML_NAMESPACE_START
 		/// 		 table will not be replaced.
 		TOML_CONSTRAINED_TEMPLATE((!std::is_convertible_v<Iter, std::string_view> && !impl::is_wide_string<Iter>),
 								  typename Iter)
-		void insert(Iter first, Iter last) noexcept
+		void insert(Iter first, Iter last)
 		{
 			if (first == last)
 				return;
@@ -774,11 +758,11 @@ TOML_NAMESPACE_START
 		/// \detail \godbolt{ddK563}
 		///
 		/// \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 1 },
 		///		{ "b", 2 },
 		///		{ "c", 3 }
-		///	}};
+		///	};
 		/// std::cout << tbl << "\n";
 		///
 		/// for (auto k : { "a", "d" })
@@ -822,7 +806,7 @@ TOML_NAMESPACE_START
 		/// 		   an empty toml::node_view, because no insertion or assignment can take place.
 		/// 		   This is the only circumstance in which this can occur.
 		template <typename KeyType, typename ValueType>
-		std::pair<iterator, bool> insert_or_assign(KeyType&& key, ValueType&& val) noexcept
+		std::pair<iterator, bool> insert_or_assign(KeyType&& key, ValueType&& val)
 		{
 			static_assert(
 				!impl::is_wide_string<KeyType> || TOML_WINDOWS_COMPAT,
@@ -863,11 +847,11 @@ TOML_NAMESPACE_START
 		/// \brief	Emplaces a new value at a specific key if one did not already exist.
 		///
 		/// \detail \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 1 },
 		///		{ "b", 2 },
 		///		{ "c", 3 }
-		///	}};
+		///	};
 		/// std::cout << tbl << "\n";
 		///
 		/// for (auto k : { "a", "d" })
@@ -899,7 +883,7 @@ TOML_NAMESPACE_START
 		///
 		/// \remark There is no difference between insert() and emplace() for trivial value types (floats, ints, bools).
 		template <typename ValueType, typename KeyType, typename... ValueArgs>
-		std::pair<iterator, bool> emplace(KeyType&& key, ValueArgs&&... args) noexcept
+		std::pair<iterator, bool> emplace(KeyType&& key, ValueArgs&&... args)
 		{
 			static_assert(
 				!impl::is_wide_string<KeyType> || TOML_WINDOWS_COMPAT,
@@ -935,11 +919,11 @@ TOML_NAMESPACE_START
 		/// \brief	Removes the specified key-value pair from the table.
 		///
 		/// \detail \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 1 },
 		///		{ "b", 2 },
 		///		{ "c", 3 }
-		///	}};
+		///	};
 		/// std::cout << tbl << "\n";
 		///
 		/// tbl.erase(tbl.begin() + 1);
@@ -963,11 +947,11 @@ TOML_NAMESPACE_START
 		/// \brief	Removes the specified key-value pair from the table (const iterator overload).
 		///
 		/// \detail \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 1 },
 		///		{ "b", 2 },
 		///		{ "c", 3 }
-		///	}};
+		///	};
 		/// std::cout << tbl << "\n";
 		///
 		/// tbl.erase(tbl.cbegin() + 1);
@@ -991,12 +975,12 @@ TOML_NAMESPACE_START
 		/// \brief	Removes the key-value pairs in the range [first, last) from the table.
 		///
 		/// \detail \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 1 },
 		///		{ "b", "bad" },
 		///		{ "c", "karma" },
 		///		{ "d", 2 }
-		///	}};
+		///	};
 		/// std::cout << tbl << "\n";
 		///
 		/// tbl.erase(tbl.cbegin() + 1, tbl.cbegin() + 3);
@@ -1021,11 +1005,11 @@ TOML_NAMESPACE_START
 		/// \brief	Removes the value with the given key from the table.
 		///
 		/// \detail \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 1 },
 		///		{ "b", 2 },
 		///		{ "c", 3 }
-		///	}};
+		///	};
 		/// std::cout << tbl << "\n";
 		///
 		/// std::cout << tbl.erase("b") << "\n";
@@ -1063,7 +1047,7 @@ TOML_NAMESPACE_START
 		/// \param 	key		Key to erase.
 		///
 		/// \returns True if any values with matching keys were found and erased.
-		bool erase(std::wstring_view key) noexcept
+		bool erase(std::wstring_view key)
 		{
 			return erase(impl::narrow(key));
 		}
@@ -1109,7 +1093,7 @@ TOML_NAMESPACE_START
 		///
 		/// \returns	An iterator to the node at the specified key, or end().
 		TOML_NODISCARD
-		iterator find(std::wstring_view key) noexcept
+		iterator find(std::wstring_view key)
 		{
 			return find(impl::narrow(key));
 		}
@@ -1122,7 +1106,7 @@ TOML_NAMESPACE_START
 		///
 		/// \returns	A const iterator to the node at the specified key, or cend().
 		TOML_NODISCARD
-		const_iterator find(std::wstring_view key) const noexcept
+		const_iterator find(std::wstring_view key) const
 		{
 			return find(impl::narrow(key));
 		}
@@ -1131,7 +1115,7 @@ TOML_NAMESPACE_START
 		///
 		/// \availability This overload is only available when #TOML_WINDOWS_COMPAT is enabled.
 		TOML_NODISCARD
-		bool contains(std::wstring_view key) const noexcept
+		bool contains(std::wstring_view key) const
 		{
 			return contains(impl::narrow(key));
 		}
@@ -1146,10 +1130,10 @@ TOML_NAMESPACE_START
 		/// \brief	Gets the node at a specific key.
 		///
 		/// \detail \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 42, },
 		///		{ "b", "is the meaning of life, apparently." }
-		///	}};
+		///	};
 		///	std::cout << R"(node ["a"] exists: )"sv << !!arr.get("a") << "\n";
 		///	std::cout << R"(node ["b"] exists: )"sv << !!arr.get("b") << "\n";
 		///	std::cout << R"(node ["c"] exists: )"sv << !!arr.get("c") << "\n";
@@ -1195,7 +1179,7 @@ TOML_NAMESPACE_START
 		///
 		/// \returns	A pointer to the node at the specified key, or nullptr.
 		TOML_NODISCARD
-		node* get(std::wstring_view key) noexcept
+		node* get(std::wstring_view key)
 		{
 			return get(impl::narrow(key));
 		}
@@ -1208,7 +1192,7 @@ TOML_NAMESPACE_START
 		///
 		/// \returns	A pointer to the node at the specified key, or nullptr.
 		TOML_NODISCARD
-		const node* get(std::wstring_view key) const noexcept
+		const node* get(std::wstring_view key) const
 		{
 			return get(impl::narrow(key));
 		}
@@ -1218,10 +1202,10 @@ TOML_NAMESPACE_START
 		/// \brief	Gets the node at a specific key if it is a particular type.
 		///
 		/// \detail \cpp
-		/// auto tbl = toml::table{{
+		/// auto tbl = toml::table{
 		///		{ "a", 42, },
 		///		{ "b", "is the meaning of life, apparently." }
-		///	}};
+		///	};
 		/// if (auto val = arr.get_as<int64_t>("a"))
 		///		std::cout << R"(node ["a"] was an integer with value )"sv << **val << "\n";
 		///
@@ -1267,7 +1251,7 @@ TOML_NAMESPACE_START
 		/// \returns	A pointer to the node at the specified key if it was of the given type, or nullptr.
 		template <typename ValueType>
 		TOML_NODISCARD
-		impl::wrap_node<ValueType>* get_as(std::wstring_view key) noexcept
+		impl::wrap_node<ValueType>* get_as(std::wstring_view key)
 		{
 			return get_as<ValueType>(impl::narrow(key));
 		}
@@ -1282,7 +1266,7 @@ TOML_NAMESPACE_START
 		/// \returns	A pointer to the node at the specified key if it was of the given type, or nullptr.
 		template <typename ValueType>
 		TOML_NODISCARD
-		const impl::wrap_node<ValueType>* get_as(std::wstring_view key) const noexcept
+		const impl::wrap_node<ValueType>* get_as(std::wstring_view key) const
 		{
 			return get_as<ValueType>(impl::narrow(key));
 		}
diff --git a/include/toml++/impl/table.inl b/include/toml++/impl/table.inl
index 40cab66b..5b3a5fcd 100644
--- a/include/toml++/impl/table.inl
+++ b/include/toml++/impl/table.inl
@@ -45,7 +45,23 @@ TOML_ANON_NAMESPACE_END;
 TOML_NAMESPACE_START
 {
 	TOML_EXTERNAL_LINKAGE
-	table::table(const table& other) noexcept //
+	table::table(const impl::table_init_pair* b, const impl::table_init_pair* e)
+	{
+		for (; b != e; b++)
+		{
+			if (!b->value) // empty node_views
+				continue;
+
+			map_.insert_or_assign(std::move(b->key), std::move(b->value));
+		}
+
+#if TOML_LIFETIME_HOOKS
+		TOML_TABLE_CREATED;
+#endif
+	}
+
+	TOML_EXTERNAL_LINKAGE
+	table::table(const table& other) //
 		: node(other),
 		  inline_{ other.inline_ }
 	{
@@ -69,7 +85,7 @@ TOML_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	table& table::operator=(const table& rhs) noexcept
+	table& table::operator=(const table& rhs)
 	{
 		if (&rhs != this)
 		{
@@ -94,17 +110,6 @@ TOML_NAMESPACE_START
 		return *this;
 	}
 
-	TOML_EXTERNAL_LINKAGE
-	table::table(impl::table_init_pair * pairs, size_t count) noexcept
-	{
-		for (size_t i = 0; i < count; i++)
-		{
-			if (!pairs[i].value) // empty node_views
-				continue;
-			map_.insert_or_assign(std::move(pairs[i].key), std::move(pairs[i].value));
-		}
-	}
-
 	TOML_EXTERNAL_LINKAGE
 	bool table::is_homogeneous(node_type ntype) const noexcept
 	{
diff --git a/include/toml++/impl/utf8.h b/include/toml++/impl/utf8.h
index a8f39b6e..ac9f197d 100644
--- a/include/toml++/impl/utf8.h
+++ b/include/toml++/impl/utf8.h
@@ -117,7 +117,7 @@ TOML_IMPL_NAMESPACE_START
 	TOML_ATTR(const)
 	constexpr uint_least32_t hex_to_dec(const T codepoint) noexcept
 	{
-		if constexpr (std::is_same_v<remove_cvref_t<T>, uint_least32_t>)
+		if constexpr (std::is_same_v<remove_cvref<T>, uint_least32_t>)
 			return codepoint >= 0x41u					 // >= 'A'
 					 ? 10u + (codepoint | 0x20u) - 0x61u // - 'a'
 					 : codepoint - 0x30u				 // - '0'
@@ -891,7 +891,7 @@ TOML_IMPL_NAMESPACE_START
 		return codepoint >= 0xD800u && codepoint <= 0xDFFF;
 	}
 
-	struct utf8_decoder final
+	struct utf8_decoder
 	{
 		// utf8_decoder based on this: https://bjoern.hoehrmann.de/utf-8/decoder/dfa/
 		// Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
diff --git a/include/toml++/impl/value.h b/include/toml++/impl/value.h
index d18723bb..851a47cd 100644
--- a/include/toml++/impl/value.h
+++ b/include/toml++/impl/value.h
@@ -108,7 +108,7 @@ TOML_IMPL_NAMESPACE_START
 #if TOML_HAS_CHAR8
 			if constexpr (is_one_of<std::decay_t<T>, char8_t*, const char8_t*>)
 				return std::string(reinterpret_cast<const char*>(static_cast<const char8_t*>(arg)));
-			else if constexpr (is_one_of<remove_cvref_t<T>, std::u8string, std::u8string_view>)
+			else if constexpr (is_one_of<remove_cvref<T>, std::u8string, std::u8string_view>)
 				return std::string(reinterpret_cast<const char*>(static_cast<const char8_t*>(arg.data())),
 								   arg.length());
 #endif // TOML_HAS_CHAR8
@@ -817,11 +817,11 @@ TOML_NAMESPACE_START
 	/// \cond
 
 	template <typename T>
-	value(T) -> value<impl::native_type_of<impl::remove_cvref_t<T>>>;
+	value(T) -> value<impl::native_type_of<impl::remove_cvref<T>>>;
 
 	template <typename T>
 	TOML_NODISCARD
-	inline decltype(auto) node::get_value_exact() const noexcept
+	inline decltype(auto) node::get_value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>)
 	{
 		using namespace impl;
 
@@ -869,7 +869,7 @@ TOML_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	inline optional<T> node::value_exact() const noexcept
+	inline optional<T> node::value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>)
 	{
 		using namespace impl;
 
@@ -892,7 +892,7 @@ TOML_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	inline optional<T> node::value() const noexcept
+	inline optional<T> node::value() const noexcept(impl::value_retrieval_is_nothrow<T>)
 	{
 		using namespace impl;
 
@@ -1009,7 +1009,7 @@ TOML_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	inline auto node::value_or(T && default_value) const noexcept
+	inline auto node::value_or(T && default_value) const noexcept(impl::value_retrieval_is_nothrow<T>)
 	{
 		using namespace impl;
 
@@ -1111,7 +1111,7 @@ TOML_NAMESPACE_START
 
 #define TOML_EXTERN(name, T)                                                                                           \
 	extern template TOML_API                                                                                           \
-	optional<T> node::name<T>() const noexcept
+	optional<T> node::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>)
 
 	TOML_EXTERN(value_exact, std::string_view);
 	TOML_EXTERN(value_exact, std::string);
diff --git a/include/toml++/impl/value.inl b/include/toml++/impl/value.inl
index bb3ec69c..316c7894 100644
--- a/include/toml++/impl/value.inl
+++ b/include/toml++/impl/value.inl
@@ -26,7 +26,8 @@ TOML_NAMESPACE_START
 	template class value<time>;
 	template class value<date_time>;
 
-#define TOML_EXTERN(name, T) template optional<T> node::name<T>() const noexcept
+#define TOML_EXTERN(name, T)                                                                                           \
+	template optional<T> node::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>)
 
 	TOML_EXTERN(value_exact, std::string_view);
 	TOML_EXTERN(value_exact, std::string);
diff --git a/include/toml++/toml.h b/include/toml++/toml.h
index 1415e2b7..6861ce12 100644
--- a/include/toml++/toml.h
+++ b/include/toml++/toml.h
@@ -92,6 +92,7 @@ TOML_POP_WARNINGS;
 #undef TOML_EVAL_BOOL_0
 #undef TOML_EVAL_BOOL_1
 #undef TOML_EXTERNAL_LINKAGE
+#undef TOML_EXTERN_NOEXCEPT
 #undef TOML_EXTERN_TEMPLATES
 #undef TOML_FLOAT_CHARCONV
 #undef TOML_FLOAT128
@@ -122,7 +123,6 @@ TOML_POP_WARNINGS;
 #undef TOML_MAKE_FLAGS
 #undef TOML_MAKE_FLAGS_
 #undef TOML_MAKE_VERSION
-#undef TOML_MAY_THROW
 #undef TOML_MSVC
 #undef TOML_NAMESPACE
 #undef TOML_NAMESPACE_END
diff --git a/tests/conformance_burntsushi_valid.cpp b/tests/conformance_burntsushi_valid.cpp
index 352b6bcb..537325dc 100644
--- a/tests/conformance_burntsushi_valid.cpp
+++ b/tests/conformance_burntsushi_valid.cpp
@@ -632,7 +632,7 @@ TEST_CASE("conformance - burntsushi/valid")
 {
 	parsing_should_succeed(FILE_LINE_ARGS, array_array, [](toml::table&& tbl) // array-array
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(comments)"sv, toml::array{
 					1,
@@ -667,26 +667,26 @@ TEST_CASE("conformance - burntsushi/valid")
 					R"(c)"sv,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_bool, [](toml::table&& tbl) // array-bool
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(a)"sv, toml::array{
 					true,
 					false,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_empty, [](toml::table&& tbl) // array-empty
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(thevoid)"sv, toml::array{
 					toml::inserter{toml::array{
@@ -698,13 +698,13 @@ TEST_CASE("conformance - burntsushi/valid")
 					}},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_hetergeneous, [](toml::table&& tbl) // array-hetergeneous
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(mixed)"sv, toml::array{
 					toml::array{
@@ -721,13 +721,13 @@ TEST_CASE("conformance - burntsushi/valid")
 					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_mixed_int_array, [](toml::table&& tbl) // array-mixed-int-array
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(arrays-and-ints)"sv, toml::array{
 					1,
@@ -736,56 +736,56 @@ TEST_CASE("conformance - burntsushi/valid")
 					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_mixed_int_float, [](toml::table&& tbl) // array-mixed-int-float
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(ints-and-floats)"sv, toml::array{
 					1,
 					1.1,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_mixed_int_string, [](toml::table&& tbl) // array-mixed-int-string
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(strings-and-ints)"sv, toml::array{
 					R"(hi)"sv,
 					42,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_mixed_string_table, [](toml::table&& tbl) // array-mixed-string-table
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(contributors)"sv, toml::array{
 					R"(Foo Bar <foo@example.com>)"sv,
-					toml::table{{
+					toml::table{
 						{ R"(email)"sv, R"(bazqux@example.com)"sv },
 						{ R"(name)"sv, R"(Baz Qux)"sv },
 						{ R"(url)"sv, R"(https://example.com/bazqux)"sv },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_nested_double, [](toml::table&& tbl) // array-nested-double
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(nest)"sv, toml::array{
 					toml::inserter{toml::array{
@@ -802,27 +802,27 @@ TEST_CASE("conformance - burntsushi/valid")
 					}},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_nested_inline_table, [](toml::table&& tbl) // array-nested-inline-table
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(a)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(b)"sv, toml::table{} },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_nested, [](toml::table&& tbl) // array-nested
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(nest)"sv, toml::array{
 					toml::array{
@@ -833,13 +833,13 @@ TEST_CASE("conformance - burntsushi/valid")
 					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_nospaces, [](toml::table&& tbl) // array-nospaces
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(ints)"sv, toml::array{
 					1,
@@ -847,51 +847,51 @@ TEST_CASE("conformance - burntsushi/valid")
 					3,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_string_quote_comma_2, [](toml::table&& tbl) // array-string-quote-comma-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(title)"sv, toml::array{
 					R"( ", )"sv,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_string_quote_comma, [](toml::table&& tbl) // array-string-quote-comma
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(title)"sv, toml::array{
 					R"(Client: "XXXX", Job: XXXX)"sv,
 					R"(Code: XXXX)"sv,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_string_with_comma, [](toml::table&& tbl) // array-string-with-comma
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(title)"sv, toml::array{
 					R"(Client: XXXX, Job: XXXX)"sv,
 					R"(Code: XXXX)"sv,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_strings, [](toml::table&& tbl) // array-strings
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(string_array)"sv, toml::array{
 					R"(all)"sv,
@@ -900,54 +900,54 @@ TEST_CASE("conformance - burntsushi/valid")
 					R"(type)"sv,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, array_table_array_string_backslash, [](toml::table&& tbl) // array-table-array-string-backslash
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(foo)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(bar)"sv, R"("{{baz}}")"sv },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, bool_bool, [](toml::table&& tbl) // bool-bool
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(f)"sv, false },
 			{ R"(t)"sv, true },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, comment_at_eof, [](toml::table&& tbl) // comment-at-eof
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(key)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, comment_at_eof2, [](toml::table&& tbl) // comment-at-eof2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(key)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, comment_everywhere, [](toml::table&& tbl) // comment-everywhere
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(group)"sv, toml::table{{
+				R"(group)"sv, toml::table{
 					{ R"(answer)"sv, 42 },
 					{ R"(d)"sv, toml::date_time{ { 1979, 5, 27 }, { 7, 32, 12, 0u }, { -7, 0 } } },
 					{ 
@@ -956,17 +956,17 @@ TEST_CASE("conformance - burntsushi/valid")
 							42,
 						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, comment_tricky, [](toml::table&& tbl) // comment-tricky
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(hash#tag)"sv, toml::table{{
+				R"(hash#tag)"sv, toml::table{
 					{ R"(#!)"sv, R"(hash bang)"sv },
 					{ 
 						R"(arr3)"sv, toml::array{
@@ -997,14 +997,14 @@ TEST_CASE("conformance - burntsushi/valid")
 						}
 					},
 					{ 
-						R"(tbl1)"sv, toml::table{{
+						R"(tbl1)"sv, toml::table{
 							{ R"(#)"sv, R"(}#)"sv },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(section)"sv, toml::table{{
+				R"(section)"sv, toml::table{
 					{ R"(8)"sv, R"(eight)"sv },
 					{ R"(eleven)"sv, 11.1 },
 					{ R"(five)"sv, 5.5 },
@@ -1016,67 +1016,67 @@ TEST_CASE("conformance - burntsushi/valid")
 					{ R"(ten)"sv, 1000.0 },
 					{ R"(three)"sv, R"(#)"sv },
 					{ R"(two)"sv, R"(22#)"sv },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, datetime_datetime, [](toml::table&& tbl) // datetime-datetime
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(lower)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 0, 0u }, { 0, 0 } } },
 			{ R"(space)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 0, 0u }, { 0, 0 } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, datetime_local_date, [](toml::table&& tbl) // datetime-local-date
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(bestdayever)"sv, toml::date{ 1987, 7, 5 } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, datetime_local_time, [](toml::table&& tbl) // datetime-local-time
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(besttimeever)"sv, toml::time{ 17, 45, 0, 0 } },
 			{ R"(milliseconds)"sv, toml::time{ 10, 32, 0, 555000000 } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, datetime_local, [](toml::table&& tbl) // datetime-local
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(local)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 0, 0u } } },
 			{ R"(milli)"sv, toml::date_time{ { 1977, 12, 21 }, { 10, 32, 0, 555000000u } } },
 			{ R"(space)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 0, 0u } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, datetime_milliseconds, [](toml::table&& tbl) // datetime-milliseconds
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(utc1)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 56, 123456000u }, { 0, 0 } } },
 			{ R"(utc2)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 56, 600000000u }, { 0, 0 } } },
 			{ R"(wita1)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 56, 123456000u }, { 8, 0 } } },
 			{ R"(wita2)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 56, 600000000u }, { 8, 0 } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, datetime_timezone, [](toml::table&& tbl) // datetime-timezone
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(nzdt)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 56, 0u }, { 13, 0 } } },
 			{ R"(nzst)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 56, 0u }, { 12, 0 } } },
 			{ R"(pdt)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 56, 0u }, { -5, 0 } } },
 			{ R"(utc)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 56, 0u }, { 0, 0 } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
@@ -1088,10 +1088,10 @@ TEST_CASE("conformance - burntsushi/valid")
 
 	parsing_should_succeed(FILE_LINE_ARGS, example, [](toml::table&& tbl) // example
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(best-day-ever)"sv, toml::date_time{ { 1987, 7, 5 }, { 17, 45, 0, 0u }, { 0, 0 } } },
 			{ 
-				R"(numtheory)"sv, toml::table{{
+				R"(numtheory)"sv, toml::table{
 					{ R"(boring)"sv, false },
 					{ 
 						R"(perfection)"sv, toml::array{
@@ -1100,15 +1100,15 @@ TEST_CASE("conformance - burntsushi/valid")
 							496,
 						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, float_exponent, [](toml::table&& tbl) // float-exponent
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(lower)"sv, 300.0 },
 			{ R"(minustenth)"sv, -0.1 },
 			{ R"(neg)"sv, 0.03 },
@@ -1117,56 +1117,56 @@ TEST_CASE("conformance - burntsushi/valid")
 			{ R"(pos)"sv, 300.0 },
 			{ R"(upper)"sv, 300.0 },
 			{ R"(zero)"sv, 3.0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, float_float, [](toml::table&& tbl) // float-float
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(negpi)"sv, -3.14 },
 			{ R"(pi)"sv, 3.14 },
 			{ R"(pospi)"sv, 3.14 },
 			{ R"(zero-intpart)"sv, 0.123 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, float_inf_and_nan, [](toml::table&& tbl) // float-inf-and-nan
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(infinity)"sv, std::numeric_limits<double>::infinity() },
 			{ R"(infinity_neg)"sv, -std::numeric_limits<double>::infinity() },
 			{ R"(infinity_plus)"sv, std::numeric_limits<double>::infinity() },
 			{ R"(nan)"sv, std::numeric_limits<double>::quiet_NaN() },
 			{ R"(nan_neg)"sv, std::numeric_limits<double>::quiet_NaN() },
 			{ R"(nan_plus)"sv, std::numeric_limits<double>::quiet_NaN() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, float_long, [](toml::table&& tbl) // float-long
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(longpi)"sv, 3.141592653589793 },
 			{ R"(neglongpi)"sv, -3.141592653589793 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, float_underscore, [](toml::table&& tbl) // float-underscore
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(after)"sv, 3141.5927 },
 			{ R"(before)"sv, 3141.5927 },
 			{ R"(exponent)"sv, 300000000000000.0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, float_zero, [](toml::table&& tbl) // float-zero
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(f1)"sv, 0.0 },
 			{ R"(f2)"sv, 0.0 },
 			{ R"(f3)"sv, 0.0 },
@@ -1174,127 +1174,127 @@ TEST_CASE("conformance - burntsushi/valid")
 			{ R"(f5)"sv, 0.0 },
 			{ R"(f6)"sv, 0.0 },
 			{ R"(f7)"sv, 0.0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, implicit_and_explicit_after, [](toml::table&& tbl) // implicit-and-explicit-after
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ 
-						R"(b)"sv, toml::table{{
+						R"(b)"sv, toml::table{
 							{ 
-								R"(c)"sv, toml::table{{
+								R"(c)"sv, toml::table{
 									{ R"(answer)"sv, 42 },
-								}}
+								}
 							},
-						}}
+						}
 					},
 					{ R"(better)"sv, 43 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, implicit_and_explicit_before, [](toml::table&& tbl) // implicit-and-explicit-before
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ 
-						R"(b)"sv, toml::table{{
+						R"(b)"sv, toml::table{
 							{ 
-								R"(c)"sv, toml::table{{
+								R"(c)"sv, toml::table{
 									{ R"(answer)"sv, 42 },
-								}}
+								}
 							},
-						}}
+						}
 					},
 					{ R"(better)"sv, 43 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, implicit_groups, [](toml::table&& tbl) // implicit-groups
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ 
-						R"(b)"sv, toml::table{{
+						R"(b)"sv, toml::table{
 							{ 
-								R"(c)"sv, toml::table{{
+								R"(c)"sv, toml::table{
 									{ R"(answer)"sv, 42 },
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, inline_table_array, [](toml::table&& tbl) // inline-table-array
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(people)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(first_name)"sv, R"(Bruce)"sv },
 						{ R"(last_name)"sv, R"(Springsteen)"sv },
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ R"(first_name)"sv, R"(Eric)"sv },
 						{ R"(last_name)"sv, R"(Clapton)"sv },
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ R"(first_name)"sv, R"(Bob)"sv },
 						{ R"(last_name)"sv, R"(Seger)"sv },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, inline_table_bool, [](toml::table&& tbl) // inline-table-bool
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ R"(a)"sv, true },
 					{ R"(b)"sv, false },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, inline_table_empty, [](toml::table&& tbl) // inline-table-empty
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(empty1)"sv, toml::table{} },
 			{ R"(empty2)"sv, toml::table{} },
 			{ 
 				R"(empty_in_array)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(not_empty)"sv, 1 },
-					}},
+					},
 					toml::table{},
 				}
 			},
 			{ 
 				R"(empty_in_array2)"sv, toml::array{
 					toml::table{},
-					toml::table{{
+					toml::table{
 						{ R"(not_empty)"sv, 1 },
-					}},
+					},
 				}
 			},
 			{ 
@@ -1305,87 +1305,87 @@ TEST_CASE("conformance - burntsushi/valid")
 				}
 			},
 			{ 
-				R"(nested_empty)"sv, toml::table{{
+				R"(nested_empty)"sv, toml::table{
 					{ R"(empty)"sv, toml::table{} },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, inline_table_end_in_bool, [](toml::table&& tbl) // inline-table-end-in-bool
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(black)"sv, toml::table{{
+				R"(black)"sv, toml::table{
 					{ R"(allow_prereleases)"sv, true },
 					{ R"(python)"sv, R"(>3.6)"sv },
 					{ R"(version)"sv, R"(>=18.9b0)"sv },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, inline_table_inline_table, [](toml::table&& tbl) // inline-table-inline-table
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(name)"sv, toml::table{{
+				R"(name)"sv, toml::table{
 					{ R"(first)"sv, R"(Tom)"sv },
 					{ R"(last)"sv, R"(Preston-Werner)"sv },
-				}}
+				}
 			},
 			{ 
-				R"(point)"sv, toml::table{{
+				R"(point)"sv, toml::table{
 					{ R"(x)"sv, 1 },
 					{ R"(y)"sv, 2 },
-				}}
+				}
 			},
 			{ 
-				R"(simple)"sv, toml::table{{
+				R"(simple)"sv, toml::table{
 					{ R"(a)"sv, 1 },
-				}}
+				}
 			},
 			{ 
-				R"(str-key)"sv, toml::table{{
+				R"(str-key)"sv, toml::table{
 					{ R"(a)"sv, 1 },
-				}}
+				}
 			},
 			{ 
 				R"(table-array)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(a)"sv, 1 },
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ R"(b)"sv, 2 },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, inline_table_multiline, [](toml::table&& tbl) // inline-table-multiline
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(tbl_multiline)"sv, toml::table{{
+				R"(tbl_multiline)"sv, toml::table{
 					{ R"(a)"sv, 1 },
 					{ R"(b)"sv, R"(multiline
 )"sv },
 					{ R"(c)"sv, R"(and yet
 another line)"sv },
 					{ R"(d)"sv, 4 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, inline_table_nest, [](toml::table&& tbl) // inline-table-nest
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(arr_arr_tbl_empty)"sv, toml::array{
 					toml::inserter{toml::array{
@@ -1396,61 +1396,61 @@ another line)"sv },
 			{ 
 				R"(arr_arr_tbl_val)"sv, toml::array{
 					toml::inserter{toml::array{
-						toml::table{{
+						toml::table{
 							{ R"(one)"sv, 1 },
-						}},
+						},
 					}},
 				}
 			},
 			{ 
 				R"(arr_arr_tbls)"sv, toml::array{
 					toml::inserter{toml::array{
-						toml::table{{
+						toml::table{
 							{ R"(one)"sv, 1 },
-						}},
-						toml::table{{
+						},
+						toml::table{
 							{ R"(two)"sv, 2 },
-						}},
+						},
 					}},
 				}
 			},
 			{ 
 				R"(arr_tbl_tbl)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ 
-							R"(tbl)"sv, toml::table{{
+							R"(tbl)"sv, toml::table{
 								{ R"(one)"sv, 1 },
-							}}
+							}
 						},
-					}},
+					},
 				}
 			},
 			{ 
-				R"(tbl_arr_tbl)"sv, toml::table{{
+				R"(tbl_arr_tbl)"sv, toml::table{
 					{ 
 						R"(arr_tbl)"sv, toml::array{
-							toml::table{{
+							toml::table{
 								{ R"(one)"sv, 1 },
-							}},
+							},
 						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(tbl_tbl_empty)"sv, toml::table{{
+				R"(tbl_tbl_empty)"sv, toml::table{
 					{ R"(tbl_0)"sv, toml::table{} },
-				}}
+				}
 			},
 			{ 
-				R"(tbl_tbl_val)"sv, toml::table{{
+				R"(tbl_tbl_val)"sv, toml::table{
 					{ 
-						R"(tbl_1)"sv, toml::table{{
+						R"(tbl_1)"sv, toml::table{
 							{ R"(one)"sv, 1 },
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
@@ -1458,182 +1458,182 @@ another line)"sv },
 
 	parsing_should_succeed(FILE_LINE_ARGS, inline_table_key_dotted, [](toml::table&& tbl) // inline-table-key-dotted
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ 
-						R"(a)"sv, toml::table{{
+						R"(a)"sv, toml::table{
 							{ R"(b)"sv, 1 },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
 				R"(arr)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ 
-							R"(T)"sv, toml::table{{
+							R"(T)"sv, toml::table{
 								{ 
-									R"(a)"sv, toml::table{{
+									R"(a)"sv, toml::table{
 										{ R"(b)"sv, 1 },
-									}}
+									}
 								},
-							}}
+							}
 						},
 						{ 
-							R"(t)"sv, toml::table{{
+							R"(t)"sv, toml::table{
 								{ 
-									R"(a)"sv, toml::table{{
+									R"(a)"sv, toml::table{
 										{ R"(b)"sv, 1 },
-									}}
+									}
 								},
-							}}
+							}
 						},
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ 
-							R"(T)"sv, toml::table{{
+							R"(T)"sv, toml::table{
 								{ 
-									R"(a)"sv, toml::table{{
+									R"(a)"sv, toml::table{
 										{ R"(b)"sv, 2 },
-									}}
+									}
 								},
-							}}
+							}
 						},
 						{ 
-							R"(t)"sv, toml::table{{
+							R"(t)"sv, toml::table{
 								{ 
-									R"(a)"sv, toml::table{{
+									R"(a)"sv, toml::table{
 										{ R"(b)"sv, 2 },
-									}}
+									}
 								},
-							}}
+							}
 						},
-					}},
+					},
 				}
 			},
 			{ 
-				R"(b)"sv, toml::table{{
+				R"(b)"sv, toml::table{
 					{ 
-						R"(a)"sv, toml::table{{
+						R"(a)"sv, toml::table{
 							{ R"(b)"sv, 1 },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(c)"sv, toml::table{{
+				R"(c)"sv, toml::table{
 					{ 
-						R"(a)"sv, toml::table{{
+						R"(a)"sv, toml::table{
 							{ R"(b)"sv, 1 },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(d)"sv, toml::table{{
+				R"(d)"sv, toml::table{
 					{ 
-						R"(a)"sv, toml::table{{
+						R"(a)"sv, toml::table{
 							{ R"(b)"sv, 1 },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(e)"sv, toml::table{{
+				R"(e)"sv, toml::table{
 					{ 
-						R"(a)"sv, toml::table{{
+						R"(a)"sv, toml::table{
 							{ R"(b)"sv, 1 },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(inline)"sv, toml::table{{
+				R"(inline)"sv, toml::table{
 					{ 
-						R"(a)"sv, toml::table{{
+						R"(a)"sv, toml::table{
 							{ R"(b)"sv, 42 },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(many)"sv, toml::table{{
+				R"(many)"sv, toml::table{
 					{ 
-						R"(dots)"sv, toml::table{{
+						R"(dots)"sv, toml::table{
 							{ 
-								R"(here)"sv, toml::table{{
+								R"(here)"sv, toml::table{
 									{ 
-										R"(dot)"sv, toml::table{{
+										R"(dot)"sv, toml::table{
 											{ 
-												R"(dot)"sv, toml::table{{
+												R"(dot)"sv, toml::table{
 													{ 
-														R"(dot)"sv, toml::table{{
+														R"(dot)"sv, toml::table{
 															{ 
-																R"(a)"sv, toml::table{{
+																R"(a)"sv, toml::table{
 																	{ 
-																		R"(b)"sv, toml::table{{
+																		R"(b)"sv, toml::table{
 																			{ R"(c)"sv, 1 },
 																			{ R"(d)"sv, 2 },
-																		}}
+																		}
 																	},
-																}}
+																}
 															},
-														}}
+														}
 													},
-												}}
+												}
 											},
-										}}
+										}
 									},
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(tbl)"sv, toml::table{{
+				R"(tbl)"sv, toml::table{
 					{ 
-						R"(a)"sv, toml::table{{
+						R"(a)"sv, toml::table{
 							{ 
-								R"(b)"sv, toml::table{{
+								R"(b)"sv, toml::table{
 									{ 
-										R"(c)"sv, toml::table{{
+										R"(c)"sv, toml::table{
 											{ 
-												R"(d)"sv, toml::table{{
+												R"(d)"sv, toml::table{
 													{ R"(e)"sv, 1 },
-												}}
+												}
 											},
-										}}
+										}
 									},
-								}}
+								}
 							},
-						}}
+						}
 					},
 					{ 
-						R"(x)"sv, toml::table{{
+						R"(x)"sv, toml::table{
 							{ 
-								R"(a)"sv, toml::table{{
+								R"(a)"sv, toml::table{
 									{ 
-										R"(b)"sv, toml::table{{
+										R"(b)"sv, toml::table{
 											{ 
-												R"(c)"sv, toml::table{{
+												R"(c)"sv, toml::table{
 													{ 
-														R"(d)"sv, toml::table{{
+														R"(d)"sv, toml::table{
 															{ R"(e)"sv, 1 },
-														}}
+														}
 													},
-												}}
+												}
 											},
-										}}
+										}
 									},
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
@@ -1641,18 +1641,18 @@ another line)"sv },
 
 	parsing_should_succeed(FILE_LINE_ARGS, integer_integer, [](toml::table&& tbl) // integer-integer
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(answer)"sv, 42 },
 			{ R"(neganswer)"sv, -42 },
 			{ R"(posanswer)"sv, 42 },
 			{ R"(zero)"sv, 0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, integer_literals, [](toml::table&& tbl) // integer-literals
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(bin1)"sv, 214 },
 			{ R"(bin2)"sv, 5 },
 			{ R"(hex1)"sv, 3735928559 },
@@ -1662,31 +1662,31 @@ another line)"sv },
 			{ R"(oct1)"sv, 342391 },
 			{ R"(oct2)"sv, 493 },
 			{ R"(oct3)"sv, 501 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, integer_long, [](toml::table&& tbl) // integer-long
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int64-max)"sv, std::numeric_limits<int64_t>::max() },
 			{ R"(int64-max-neg)"sv, std::numeric_limits<int64_t>::min() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, integer_underscore, [](toml::table&& tbl) // integer-underscore
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(kilo)"sv, 1000 },
 			{ R"(x)"sv, 1111 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, integer_zero, [](toml::table&& tbl) // integer-zero
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(a2)"sv, 0 },
 			{ R"(a3)"sv, 0 },
 			{ R"(b1)"sv, 0 },
@@ -1699,7 +1699,7 @@ another line)"sv },
 			{ R"(h2)"sv, 0 },
 			{ R"(h3)"sv, 0 },
 			{ R"(o1)"sv, 0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
@@ -1707,46 +1707,46 @@ another line)"sv },
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_case_sensitive, [](toml::table&& tbl) // key-case-sensitive
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(Section)"sv, toml::table{{
+				R"(Section)"sv, toml::table{
 					{ R"(M)"sv, R"(latin letter M)"sv },
 					{ R"(name)"sv, R"(different section!!)"sv },
 					{ R"(Μ)"sv, R"(greek capital letter MU)"sv },
 					{ R"(μ)"sv, R"(greek small letter mu)"sv },
-				}}
+				}
 			},
 			{ R"(sectioN)"sv, R"(NN)"sv },
 			{ 
-				R"(section)"sv, toml::table{{
+				R"(section)"sv, toml::table{
 					{ R"(NAME)"sv, R"(upper)"sv },
 					{ R"(Name)"sv, R"(capitalized)"sv },
 					{ R"(name)"sv, R"(lower)"sv },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_escapes, [](toml::table&& tbl) // key-escapes
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(
 )"sv, R"(newline)"sv },
 			{ R"(")"sv, R"(just a quote)"sv },
 			{ 
-				R"("quoted")"sv, toml::table{{
+				R"("quoted")"sv, toml::table{
 					{ R"(quote)"sv, true },
-				}}
+				}
 			},
 			{ 
-				R"(a.b)"sv, toml::table{{
+				R"(a.b)"sv, toml::table{
 					{ R"(À)"sv, toml::table{} },
-				}}
+				}
 			},
 			{ R"(backsp)"sv, toml::table{} },
 			{ R"(À)"sv, R"(latin capital letter A with grave)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
@@ -1754,55 +1754,55 @@ another line)"sv },
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_dotted, [](toml::table&& tbl) // key-dotted
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ 
-						R"(few)"sv, toml::table{{
+						R"(few)"sv, toml::table{
 							{ 
-								R"(dots)"sv, toml::table{{
+								R"(dots)"sv, toml::table{
 									{ 
-										R"(polka)"sv, toml::table{{
+										R"(polka)"sv, toml::table{
 											{ R"(dance-with)"sv, R"(Dot)"sv },
 											{ R"(dot)"sv, R"(again?)"sv },
-										}}
+										}
 									},
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
 				R"(arr)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ 
-							R"(a)"sv, toml::table{{
+							R"(a)"sv, toml::table{
 								{ 
-									R"(b)"sv, toml::table{{
+									R"(b)"sv, toml::table{
 										{ R"(c)"sv, 1 },
 										{ R"(d)"sv, 2 },
-									}}
+									}
 								},
-							}}
+							}
 						},
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ 
-							R"(a)"sv, toml::table{{
+							R"(a)"sv, toml::table{
 								{ 
-									R"(b)"sv, toml::table{{
+									R"(b)"sv, toml::table{
 										{ R"(c)"sv, 3 },
 										{ R"(d)"sv, 4 },
-									}}
+									}
 								},
-							}}
+							}
 						},
-					}},
+					},
 				}
 			},
 			{ 
-				R"(count)"sv, toml::table{{
+				R"(count)"sv, toml::table{
 					{ R"(a)"sv, 1 },
 					{ R"(b)"sv, 2 },
 					{ R"(c)"sv, 3 },
@@ -1815,163 +1815,163 @@ another line)"sv },
 					{ R"(j)"sv, 10 },
 					{ R"(k)"sv, 11 },
 					{ R"(l)"sv, 12 },
-				}}
+				}
 			},
 			{ 
-				R"(many)"sv, toml::table{{
+				R"(many)"sv, toml::table{
 					{ 
-						R"(dots)"sv, toml::table{{
+						R"(dots)"sv, toml::table{
 							{ 
-								R"(here)"sv, toml::table{{
+								R"(here)"sv, toml::table{
 									{ 
-										R"(dot)"sv, toml::table{{
+										R"(dot)"sv, toml::table{
 											{ 
-												R"(dot)"sv, toml::table{{
+												R"(dot)"sv, toml::table{
 													{ R"(dot)"sv, 42 },
-												}}
+												}
 											},
-										}}
+										}
 									},
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(name)"sv, toml::table{{
+				R"(name)"sv, toml::table{
 					{ R"(first)"sv, R"(Arthur)"sv },
 					{ R"(last)"sv, R"(Dent)"sv },
-				}}
+				}
 			},
 			{ 
-				R"(tbl)"sv, toml::table{{
+				R"(tbl)"sv, toml::table{
 					{ 
-						R"(a)"sv, toml::table{{
+						R"(a)"sv, toml::table{
 							{ 
-								R"(b)"sv, toml::table{{
+								R"(b)"sv, toml::table{
 									{ R"(c)"sv, 42.666 },
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_empty, [](toml::table&& tbl) // key-empty
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ ""sv, R"(blank)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_equals_nospace, [](toml::table&& tbl) // key-equals-nospace
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(answer)"sv, 42 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_numeric_dotted, [](toml::table&& tbl) // key-numeric-dotted
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(1)"sv, toml::table{{
+				R"(1)"sv, toml::table{
 					{ R"(2)"sv, 3 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_numeric, [](toml::table&& tbl) // key-numeric
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(1)"sv, 1 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_quoted_dots, [](toml::table&& tbl) // key-quoted-dots
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(plain)"sv, 1 },
 			{ 
-				R"(plain_table)"sv, toml::table{{
+				R"(plain_table)"sv, toml::table{
 					{ R"(plain)"sv, 3 },
 					{ R"(with.dot)"sv, 4 },
-				}}
+				}
 			},
 			{ 
-				R"(table)"sv, toml::table{{
+				R"(table)"sv, toml::table{
 					{ 
-						R"(withdot)"sv, toml::table{{
+						R"(withdot)"sv, toml::table{
 							{ R"(key.with.dots)"sv, 6 },
 							{ R"(plain)"sv, 5 },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ R"(with.dot)"sv, 2 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_space, [](toml::table&& tbl) // key-space
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(a b)"sv, 1 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_special_chars, [](toml::table&& tbl) // key-special-chars
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(~!@$^&*()_+-`1234567890[]|/?><.,;:')"sv, 1 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, key_special_word, [](toml::table&& tbl) // key-special-word
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(false)"sv, false },
 			{ R"(inf)"sv, 100000000 },
 			{ R"(nan)"sv, R"(ceci n'est pas un nombre)"sv },
 			{ R"(true)"sv, 1 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, newline_crlf, [](toml::table&& tbl) // newline-crlf
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(newline)"sv, R"(crlf)"sv },
 			{ R"(os)"sv, R"(DOS)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, newline_lf, [](toml::table&& tbl) // newline-lf
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(newline)"sv, R"(lf)"sv },
 			{ R"(os)"sv, R"(unix)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_example_1_compact, [](toml::table&& tbl) // spec-example-1-compact
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(clients)"sv, toml::table{{
+				R"(clients)"sv, toml::table{
 					{ 
 						R"(data)"sv, toml::array{
 							toml::array{
@@ -1990,10 +1990,10 @@ another line)"sv },
 							R"(omega)"sv,
 						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(database)"sv, toml::table{{
+				R"(database)"sv, toml::table{
 					{ R"(connection_max)"sv, 5000 },
 					{ R"(enabled)"sv, true },
 					{ 
@@ -2004,40 +2004,40 @@ another line)"sv },
 						}
 					},
 					{ R"(server)"sv, R"(192.168.1.1)"sv },
-				}}
+				}
 			},
 			{ 
-				R"(owner)"sv, toml::table{{
+				R"(owner)"sv, toml::table{
 					{ R"(dob)"sv, toml::date_time{ { 1979, 5, 27 }, { 7, 32, 0, 0u }, { -8, 0 } } },
 					{ R"(name)"sv, R"(Lance Uppercut)"sv },
-				}}
+				}
 			},
 			{ 
-				R"(servers)"sv, toml::table{{
+				R"(servers)"sv, toml::table{
 					{ 
-						R"(alpha)"sv, toml::table{{
+						R"(alpha)"sv, toml::table{
 							{ R"(dc)"sv, R"(eqdc10)"sv },
 							{ R"(ip)"sv, R"(10.0.0.1)"sv },
-						}}
+						}
 					},
 					{ 
-						R"(beta)"sv, toml::table{{
+						R"(beta)"sv, toml::table{
 							{ R"(dc)"sv, R"(eqdc10)"sv },
 							{ R"(ip)"sv, R"(10.0.0.2)"sv },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ R"(title)"sv, R"(TOML Example)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_example_1, [](toml::table&& tbl) // spec-example-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(clients)"sv, toml::table{{
+				R"(clients)"sv, toml::table{
 					{ 
 						R"(data)"sv, toml::array{
 							toml::array{
@@ -2056,10 +2056,10 @@ another line)"sv },
 							R"(omega)"sv,
 						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(database)"sv, toml::table{{
+				R"(database)"sv, toml::table{
 					{ R"(connection_max)"sv, 5000 },
 					{ R"(enabled)"sv, true },
 					{ 
@@ -2070,62 +2070,62 @@ another line)"sv },
 						}
 					},
 					{ R"(server)"sv, R"(192.168.1.1)"sv },
-				}}
+				}
 			},
 			{ 
-				R"(owner)"sv, toml::table{{
+				R"(owner)"sv, toml::table{
 					{ R"(dob)"sv, toml::date_time{ { 1979, 5, 27 }, { 7, 32, 0, 0u }, { -8, 0 } } },
 					{ R"(name)"sv, R"(Lance Uppercut)"sv },
-				}}
+				}
 			},
 			{ 
-				R"(servers)"sv, toml::table{{
+				R"(servers)"sv, toml::table{
 					{ 
-						R"(alpha)"sv, toml::table{{
+						R"(alpha)"sv, toml::table{
 							{ R"(dc)"sv, R"(eqdc10)"sv },
 							{ R"(ip)"sv, R"(10.0.0.1)"sv },
-						}}
+						}
 					},
 					{ 
-						R"(beta)"sv, toml::table{{
+						R"(beta)"sv, toml::table{
 							{ R"(dc)"sv, R"(eqdc10)"sv },
 							{ R"(ip)"sv, R"(10.0.0.2)"sv },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ R"(title)"sv, R"(TOML Example)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_double_quote_escape, [](toml::table&& tbl) // string-double-quote-escape
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(test)"sv, R"("one")"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_empty, [](toml::table&& tbl) // string-empty
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(answer)"sv, ""sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_escaped_escape, [](toml::table&& tbl) // string-escaped-escape
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(answer)"sv, R"(\x64)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_multiline_quotes, [](toml::table&& tbl) // string-multiline-quotes
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(lit_one)"sv, R"('one quote')"sv },
 			{ R"(lit_one_space)"sv, R"( 'one quote' )"sv },
 			{ R"(lit_two)"sv, R"(''two quotes'')"sv },
@@ -2136,13 +2136,13 @@ another line)"sv },
 			{ R"(one_space)"sv, R"( "one quote" )"sv },
 			{ R"(two)"sv, R"(""two quotes"")"sv },
 			{ R"(two_space)"sv, R"( ""two quotes"" )"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_multiline, [](toml::table&& tbl) // string-multiline
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(equivalent_one)"sv, R"(The quick brown fox jumps over the lazy dog.)"sv },
 			{ R"(equivalent_three)"sv, R"(The quick brown fox jumps over the lazy dog.)"sv },
 			{ R"(equivalent_two)"sv, R"(The quick brown fox jumps over the lazy dog.)"sv },
@@ -2158,13 +2158,13 @@ b)"sv },
 			{ R"(multiline_empty_two)"sv, ""sv },
 			{ R"(no-space)"sv, R"(ab)"sv },
 			{ R"(whitespace-after-bs)"sv, R"(The quick brown fox jumps over the lazy dog.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_nl, [](toml::table&& tbl) // string-nl
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(lit_nl_end)"sv, R"(value\n)"sv },
 			{ R"(lit_nl_mid)"sv, R"(val\nue)"sv },
 			{ R"(lit_nl_uni)"sv, R"(val\ue)"sv },
@@ -2172,13 +2172,13 @@ b)"sv },
 )"sv },
 			{ R"(nl_mid)"sv, R"(val
 ue)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_raw_multiline, [](toml::table&& tbl) // string-raw-multiline
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(firstnl)"sv, R"(This string has a ' quote character.)"sv },
 			{ R"(multiline)"sv, R"(This string
 has ' a quote character
@@ -2186,13 +2186,13 @@ and more than
 one newline
 in it.)"sv },
 			{ R"(oneline)"sv, R"(This string has a ' quote character.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_raw, [](toml::table&& tbl) // string-raw
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(backslash)"sv, R"(This string has a \\ backslash character.)"sv },
 			{ R"(backspace)"sv, R"(This string has a \b backspace character.)"sv },
 			{ R"(carriage)"sv, R"(This string has a \r carriage return character.)"sv },
@@ -2200,24 +2200,24 @@ in it.)"sv },
 			{ R"(newline)"sv, R"(This string has a \n new line character.)"sv },
 			{ R"(slash)"sv, R"(This string has a \/ slash character.)"sv },
 			{ R"(tab)"sv, R"(This string has a \t tab character.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_simple, [](toml::table&& tbl) // string-simple
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(answer)"sv, R"(You are not drinking enough whisky.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_with_pound, [](toml::table&& tbl) // string-with-pound
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(pound)"sv, R"(We see no # comments here.)"sv },
 			{ R"(poundcomment)"sv, R"(But there are # some comments here.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
@@ -2225,7 +2225,7 @@ in it.)"sv },
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_escape_tricky, [](toml::table&& tbl) // string-escape-tricky
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(end_esc)"sv, R"(String does not end here" but ends here\)"sv },
 			{ R"(lit_end_esc)"sv, R"(String ends here\)"sv },
 			{ R"(lit_multiline_end)"sv, R"(There is no escape\)"sv },
@@ -2233,24 +2233,24 @@ in it.)"sv },
 			{ R"(multiline_end_esc)"sv, R"(When will it end? """...""" should be here")"sv },
 			{ R"(multiline_not_unicode)"sv, R"(\u0041)"sv },
 			{ R"(multiline_unicode)"sv, R"( )"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_unicode_escape, [](toml::table&& tbl) // string-unicode-escape
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(answer4)"sv, R"(δ)"sv },
 			{ R"(answer8)"sv, R"(δ)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, string_unicode_literal, [](toml::table&& tbl) // string-unicode-literal
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(answer)"sv, R"(δ)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
@@ -2258,244 +2258,244 @@ in it.)"sv },
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_array_implicit, [](toml::table&& tbl) // table-array-implicit
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(albums)"sv, toml::table{{
+				R"(albums)"sv, toml::table{
 					{ 
 						R"(songs)"sv, toml::array{
-							toml::table{{
+							toml::table{
 								{ R"(name)"sv, R"(Glory Days)"sv },
-							}},
+							},
 						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_array_many, [](toml::table&& tbl) // table-array-many
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(people)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(first_name)"sv, R"(Bruce)"sv },
 						{ R"(last_name)"sv, R"(Springsteen)"sv },
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ R"(first_name)"sv, R"(Eric)"sv },
 						{ R"(last_name)"sv, R"(Clapton)"sv },
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ R"(first_name)"sv, R"(Bob)"sv },
 						{ R"(last_name)"sv, R"(Seger)"sv },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_array_nest, [](toml::table&& tbl) // table-array-nest
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(albums)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(name)"sv, R"(Born to Run)"sv },
 						{ 
 							R"(songs)"sv, toml::array{
-								toml::table{{
+								toml::table{
 									{ R"(name)"sv, R"(Jungleland)"sv },
-								}},
-								toml::table{{
+								},
+								toml::table{
 									{ R"(name)"sv, R"(Meeting Across the River)"sv },
-								}},
+								},
 							}
 						},
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ R"(name)"sv, R"(Born in the USA)"sv },
 						{ 
 							R"(songs)"sv, toml::array{
-								toml::table{{
+								toml::table{
 									{ R"(name)"sv, R"(Glory Days)"sv },
-								}},
-								toml::table{{
+								},
+								toml::table{
 									{ R"(name)"sv, R"(Dancing in the Dark)"sv },
-								}},
+								},
 							}
 						},
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_array_one, [](toml::table&& tbl) // table-array-one
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(people)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(first_name)"sv, R"(Bruce)"sv },
 						{ R"(last_name)"sv, R"(Springsteen)"sv },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_array_table_array, [](toml::table&& tbl) // table-array-table-array
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(a)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ 
 							R"(b)"sv, toml::array{
-								toml::table{{
+								toml::table{
 									{ 
-										R"(c)"sv, toml::table{{
+										R"(c)"sv, toml::table{
 											{ R"(d)"sv, R"(val0)"sv },
-										}}
+										}
 									},
-								}},
-								toml::table{{
+								},
+								toml::table{
 									{ 
-										R"(c)"sv, toml::table{{
+										R"(c)"sv, toml::table{
 											{ R"(d)"sv, R"(val1)"sv },
-										}}
+										}
 									},
-								}},
+								},
 							}
 						},
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_empty, [](toml::table&& tbl) // table-empty
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(a)"sv, toml::table{} },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_keyword, [](toml::table&& tbl) // table-keyword
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(true)"sv, toml::table{} },
 			{ R"(false)"sv, toml::table{} },
 			{ R"(inf)"sv, toml::table{} },
 			{ R"(nan)"sv, toml::table{} },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_no_eol, [](toml::table&& tbl) // table-no-eol
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(table)"sv, toml::table{} },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_sub_empty, [](toml::table&& tbl) // table-sub-empty
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ R"(b)"sv, toml::table{} },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_whitespace, [](toml::table&& tbl) // table-whitespace
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(valid key)"sv, toml::table{} },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_with_literal_string, [](toml::table&& tbl) // table-with-literal-string
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ 
-						R"("b")"sv, toml::table{{
+						R"("b")"sv, toml::table{
 							{ 
-								R"(c)"sv, toml::table{{
+								R"(c)"sv, toml::table{
 									{ R"(answer)"sv, 42 },
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_with_pound, [](toml::table&& tbl) // table-with-pound
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(key#group)"sv, toml::table{{
+				R"(key#group)"sv, toml::table{
 					{ R"(answer)"sv, 42 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_with_single_quotes, [](toml::table&& tbl) // table-with-single-quotes
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ 
-						R"(b)"sv, toml::table{{
+						R"(b)"sv, toml::table{
 							{ 
-								R"(c)"sv, toml::table{{
+								R"(c)"sv, toml::table{
 									{ R"(answer)"sv, 42 },
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_without_super, [](toml::table&& tbl) // table-without-super
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(x)"sv, toml::table{{
+				R"(x)"sv, toml::table{
 					{ 
-						R"(y)"sv, toml::table{{
+						R"(y)"sv, toml::table{
 							{ 
-								R"(z)"sv, toml::table{{
+								R"(z)"sv, toml::table{
 									{ R"(w)"sv, toml::table{} },
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
@@ -2503,56 +2503,56 @@ in it.)"sv },
 
 	parsing_should_succeed(FILE_LINE_ARGS, table_names, [](toml::table&& tbl) // table-names
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ R"( x )"sv, toml::table{} },
 					{ 
-						R"(b)"sv, toml::table{{
+						R"(b)"sv, toml::table{
 							{ R"(c)"sv, toml::table{} },
-						}}
+						}
 					},
 					{ R"(b.c)"sv, toml::table{} },
 					{ R"(d.e)"sv, toml::table{} },
-				}}
+				}
 			},
 			{ 
-				R"(d)"sv, toml::table{{
+				R"(d)"sv, toml::table{
 					{ 
-						R"(e)"sv, toml::table{{
+						R"(e)"sv, toml::table{
 							{ R"(f)"sv, toml::table{} },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(g)"sv, toml::table{{
+				R"(g)"sv, toml::table{
 					{ 
-						R"(h)"sv, toml::table{{
+						R"(h)"sv, toml::table{
 							{ R"(i)"sv, toml::table{} },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(j)"sv, toml::table{{
+				R"(j)"sv, toml::table{
 					{ 
-						R"(ʞ)"sv, toml::table{{
+						R"(ʞ)"sv, toml::table{
 							{ R"(l)"sv, toml::table{} },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(x)"sv, toml::table{{
+				R"(x)"sv, toml::table{
 					{ 
-						R"(1)"sv, toml::table{{
+						R"(1)"sv, toml::table{
 							{ R"(2)"sv, toml::table{} },
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
diff --git a/tests/conformance_iarna_valid.cpp b/tests/conformance_iarna_valid.cpp
index dcbe3116..f95e89cb 100644
--- a/tests/conformance_iarna_valid.cpp
+++ b/tests/conformance_iarna_valid.cpp
@@ -275,7 +275,7 @@ TEST_CASE("conformance - iarna/valid")
 {
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_1, [](toml::table&& tbl) // spec-array-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(integers)"sv, toml::array{
 					1,
@@ -283,13 +283,13 @@ TEST_CASE("conformance - iarna/valid")
 					3,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_2, [](toml::table&& tbl) // spec-array-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(colors)"sv, toml::array{
 					R"(red)"sv,
@@ -297,13 +297,13 @@ TEST_CASE("conformance - iarna/valid")
 					R"(green)"sv,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_3, [](toml::table&& tbl) // spec-array-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(nested_array_of_int)"sv, toml::array{
 					toml::array{
@@ -317,13 +317,13 @@ TEST_CASE("conformance - iarna/valid")
 					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_4, [](toml::table&& tbl) // spec-array-4
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(string_array)"sv, toml::array{
 					R"(all)"sv,
@@ -332,13 +332,13 @@ TEST_CASE("conformance - iarna/valid")
 					R"(type)"sv,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_5, [](toml::table&& tbl) // spec-array-5
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(nested_mixed_array)"sv, toml::array{
 					toml::array{
@@ -352,13 +352,13 @@ TEST_CASE("conformance - iarna/valid")
 					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_7, [](toml::table&& tbl) // spec-array-7
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(integers2)"sv, toml::array{
 					1,
@@ -366,26 +366,26 @@ TEST_CASE("conformance - iarna/valid")
 					3,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_8, [](toml::table&& tbl) // spec-array-8
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(integers3)"sv, toml::array{
 					1,
 					2,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_mixed_number_types, [](toml::table&& tbl) // spec-array-mixed-number-types
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(numbers)"sv, toml::array{
 					0.1,
@@ -396,702 +396,702 @@ TEST_CASE("conformance - iarna/valid")
 					5,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_more_mixed_types, [](toml::table&& tbl) // spec-array-more-mixed-types
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(contributors)"sv, toml::array{
 					R"(Foo Bar <foo@example.com>)"sv,
-					toml::table{{
+					toml::table{
 						{ R"(name)"sv, R"(Baz Qux)"sv },
 						{ R"(email)"sv, R"(bazqux@example.com)"sv },
 						{ R"(url)"sv, R"(https://example.com/bazqux)"sv },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_of_tables_1, [](toml::table&& tbl) // spec-array-of-tables-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(products)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(name)"sv, R"(Hammer)"sv },
 						{ R"(sku)"sv, 738594937 },
-					}},
+					},
 					toml::table{},
-					toml::table{{
+					toml::table{
 						{ R"(name)"sv, R"(Nail)"sv },
 						{ R"(sku)"sv, 284758393 },
 						{ R"(color)"sv, R"(gray)"sv },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_of_tables_2, [](toml::table&& tbl) // spec-array-of-tables-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(fruit)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(name)"sv, R"(apple)"sv },
 						{ 
-							R"(physical)"sv, toml::table{{
+							R"(physical)"sv, toml::table{
 								{ R"(color)"sv, R"(red)"sv },
 								{ R"(shape)"sv, R"(round)"sv },
-							}}
+							}
 						},
 						{ 
 							R"(variety)"sv, toml::array{
-								toml::table{{
+								toml::table{
 									{ R"(name)"sv, R"(red delicious)"sv },
-								}},
-								toml::table{{
+								},
+								toml::table{
 									{ R"(name)"sv, R"(granny smith)"sv },
-								}},
+								},
 							}
 						},
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ R"(name)"sv, R"(banana)"sv },
 						{ 
 							R"(variety)"sv, toml::array{
-								toml::table{{
+								toml::table{
 									{ R"(name)"sv, R"(plantain)"sv },
-								}},
+								},
 							}
 						},
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_array_of_tables_3, [](toml::table&& tbl) // spec-array-of-tables-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(points)"sv, toml::array{
-					toml::table{{
+					toml::table{
 						{ R"(x)"sv, 1 },
 						{ R"(y)"sv, 2 },
 						{ R"(z)"sv, 3 },
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ R"(x)"sv, 7 },
 						{ R"(y)"sv, 8 },
 						{ R"(z)"sv, 9 },
-					}},
-					toml::table{{
+					},
+					toml::table{
 						{ R"(x)"sv, 2 },
 						{ R"(y)"sv, 4 },
 						{ R"(z)"sv, 8 },
-					}},
+					},
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_boolean_1, [](toml::table&& tbl) // spec-boolean-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(bool1)"sv, true },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_boolean_2, [](toml::table&& tbl) // spec-boolean-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(bool1)"sv, false },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_case_sensitive, [](toml::table&& tbl) // spec-case-sensitive
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(abc)"sv, 123 },
 			{ R"(ABC)"sv, 456 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_comment_mid_array, [](toml::table&& tbl) // spec-comment-mid-array
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
 				R"(abc)"sv, toml::array{
 					123,
 					456,
 				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_comment_mid_string, [](toml::table&& tbl) // spec-comment-mid-string
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(another)"sv, R"(# This is not a comment)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_comment_tab, [](toml::table&& tbl) // spec-comment-tab
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(key)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_comment, [](toml::table&& tbl) // spec-comment
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(key)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_date_local_1, [](toml::table&& tbl) // spec-date-local-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(ld1)"sv, toml::date{ 1979, 5, 27 } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_date_time_1, [](toml::table&& tbl) // spec-date-time-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(odt1)"sv, toml::date_time{ { 1979, 5, 27 }, { 7, 32, 0, 0u }, { 0, 0 } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_date_time_2, [](toml::table&& tbl) // spec-date-time-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(odt2)"sv, toml::date_time{ { 1979, 5, 27 }, { 0, 32, 0, 0u }, { -7, 0 } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_date_time_3, [](toml::table&& tbl) // spec-date-time-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(odt3)"sv, toml::date_time{ { 1979, 5, 27 }, { 0, 32, 0, 999999000u }, { -7, 0 } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_date_time_4, [](toml::table&& tbl) // spec-date-time-4
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(odt4)"sv, toml::date_time{ { 1979, 5, 27 }, { 7, 32, 0, 0u }, { 0, 0 } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_date_time_5, [](toml::table&& tbl) // spec-date-time-5
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(odt5)"sv, toml::date_time{ { 1979, 5, 27 }, { 7, 32, 0, 123000000u }, { 0, 0 } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_date_time_local_1, [](toml::table&& tbl) // spec-date-time-local-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(ldt1)"sv, toml::date_time{ { 1979, 5, 27 }, { 7, 32, 0, 0u } } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_dotted_keys_1, [](toml::table&& tbl) // spec-dotted-keys-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(name)"sv, R"(Orange)"sv },
 			{ 
-				R"(physical)"sv, toml::table{{
+				R"(physical)"sv, toml::table{
 					{ R"(color)"sv, R"(orange)"sv },
 					{ R"(shape)"sv, R"(round)"sv },
-				}}
+				}
 			},
 			{ 
-				R"(site)"sv, toml::table{{
+				R"(site)"sv, toml::table{
 					{ R"(google.com)"sv, true },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_dotted_keys_2, [](toml::table&& tbl) // spec-dotted-keys-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ R"(b)"sv, 23 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_dotted_keys_3, [](toml::table&& tbl) // spec-dotted-keys-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ R"(b)"sv, 23 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_empty_key_name_1, [](toml::table&& tbl) // spec-empty-key-name-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ ""sv, R"(blank)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_empty_key_name_2, [](toml::table&& tbl) // spec-empty-key-name-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ ""sv, R"(blank)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_extend_dotted_object_1, [](toml::table&& tbl) // spec-extend-dotted-object-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(fruit)"sv, toml::table{{
+				R"(fruit)"sv, toml::table{
 					{ 
-						R"(apple)"sv, toml::table{{
+						R"(apple)"sv, toml::table{
 							{ R"(smooth)"sv, true },
-						}}
+						}
 					},
 					{ R"(orange)"sv, 2 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_extend_dotted_object_2, [](toml::table&& tbl) // spec-extend-dotted-object-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(apple)"sv, toml::table{{
+				R"(apple)"sv, toml::table{
 					{ R"(type)"sv, R"(fruit)"sv },
 					{ R"(skin)"sv, R"(thin)"sv },
 					{ R"(color)"sv, R"(red)"sv },
-				}}
+				}
 			},
 			{ 
-				R"(orange)"sv, toml::table{{
+				R"(orange)"sv, toml::table{
 					{ R"(type)"sv, R"(fruit)"sv },
 					{ R"(skin)"sv, R"(thick)"sv },
 					{ R"(color)"sv, R"(orange)"sv },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_extend_dotted_object_3, [](toml::table&& tbl) // spec-extend-dotted-object-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(apple)"sv, toml::table{{
+				R"(apple)"sv, toml::table{
 					{ R"(type)"sv, R"(fruit)"sv },
 					{ R"(skin)"sv, R"(thin)"sv },
 					{ R"(color)"sv, R"(red)"sv },
-				}}
+				}
 			},
 			{ 
-				R"(orange)"sv, toml::table{{
+				R"(orange)"sv, toml::table{
 					{ R"(type)"sv, R"(fruit)"sv },
 					{ R"(skin)"sv, R"(thick)"sv },
 					{ R"(color)"sv, R"(orange)"sv },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_1, [](toml::table&& tbl) // spec-float-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(flt1)"sv, 1.0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_10, [](toml::table&& tbl) // spec-float-10
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(sf1)"sv, std::numeric_limits<double>::infinity() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_11, [](toml::table&& tbl) // spec-float-11
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(sf2)"sv, std::numeric_limits<double>::infinity() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_12, [](toml::table&& tbl) // spec-float-12
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(sf2)"sv, -std::numeric_limits<double>::infinity() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_13, [](toml::table&& tbl) // spec-float-13
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(sf4)"sv, std::numeric_limits<double>::quiet_NaN() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_14, [](toml::table&& tbl) // spec-float-14
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(sf5)"sv, std::numeric_limits<double>::quiet_NaN() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_15, [](toml::table&& tbl) // spec-float-15
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(sf6)"sv, std::numeric_limits<double>::quiet_NaN() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_2, [](toml::table&& tbl) // spec-float-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(flt2)"sv, 3.1415 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_3, [](toml::table&& tbl) // spec-float-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(flt3)"sv, -0.01 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_4, [](toml::table&& tbl) // spec-float-4
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(flt4)"sv, 5e+22 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_5, [](toml::table&& tbl) // spec-float-5
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(flt5)"sv, 1000000.0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_6, [](toml::table&& tbl) // spec-float-6
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(flt6)"sv, -0.02 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_7, [](toml::table&& tbl) // spec-float-7
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(flt7)"sv, 6.626e-34 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_8, [](toml::table&& tbl) // spec-float-8
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(flt8)"sv, 224617.445991228 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_float_9, [](toml::table&& tbl) // spec-float-9
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(flt9)"sv, -0.0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_1, [](toml::table&& tbl) // spec-int-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int1)"sv, 99 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_2, [](toml::table&& tbl) // spec-int-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int2)"sv, 42 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_3, [](toml::table&& tbl) // spec-int-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int3)"sv, 0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_3a, [](toml::table&& tbl) // spec-int-3a
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int3)"sv, 0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_3b, [](toml::table&& tbl) // spec-int-3b
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int3)"sv, 0 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_4, [](toml::table&& tbl) // spec-int-4
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int4)"sv, -17 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_5, [](toml::table&& tbl) // spec-int-5
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int5)"sv, 1000 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_6, [](toml::table&& tbl) // spec-int-6
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int6)"sv, 5349221 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_7, [](toml::table&& tbl) // spec-int-7
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(int7)"sv, 12345 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_bin1, [](toml::table&& tbl) // spec-int-bin1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(bin1)"sv, 214 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_hex1, [](toml::table&& tbl) // spec-int-hex1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(hex1)"sv, 3735928559 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_hex2, [](toml::table&& tbl) // spec-int-hex2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(hex2)"sv, 3735928559 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_hex3, [](toml::table&& tbl) // spec-int-hex3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(hex3)"sv, 3735928559 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_max, [](toml::table&& tbl) // spec-int-max
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(max)"sv, std::numeric_limits<int64_t>::max() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_min, [](toml::table&& tbl) // spec-int-min
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(min)"sv, std::numeric_limits<int64_t>::min() },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_oct1, [](toml::table&& tbl) // spec-int-oct1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(oct1)"sv, 342391 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_int_oct2, [](toml::table&& tbl) // spec-int-oct2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(oct2)"sv, 493 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_key_value_pair_1, [](toml::table&& tbl) // spec-key-value-pair-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(key)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_key_value_pair_2, [](toml::table&& tbl) // spec-key-value-pair-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(bare_key)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_key_value_pair_3, [](toml::table&& tbl) // spec-key-value-pair-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(bare-key)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_key_value_pair_4, [](toml::table&& tbl) // spec-key-value-pair-4
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(1234)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_key_value_pair_5, [](toml::table&& tbl) // spec-key-value-pair-5
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(1234)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_key_value_pair_6, [](toml::table&& tbl) // spec-key-value-pair-6
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(-)"sv, 1 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_key_value_pair_7, [](toml::table&& tbl) // spec-key-value-pair-7
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(_)"sv, 1 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_key_value_pair_8, [](toml::table&& tbl) // spec-key-value-pair-8
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(-_-_-_-_-)"sv, 1 },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_key_value_pair_9, [](toml::table&& tbl) // spec-key-value-pair-9
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(3)"sv, toml::table{{
+				R"(3)"sv, toml::table{
 					{ R"(14159)"sv, R"(pi)"sv },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_quoted_literal_keys_1, [](toml::table&& tbl) // spec-quoted-literal-keys-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(quoted "value")"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_readme_example, [](toml::table&& tbl) // spec-readme-example
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(title)"sv, R"(TOML Example)"sv },
 			{ 
-				R"(owner)"sv, toml::table{{
+				R"(owner)"sv, toml::table{
 					{ R"(name)"sv, R"(Tom Preston-Werner)"sv },
 					{ R"(dob)"sv, toml::date_time{ { 1979, 5, 27 }, { 7, 32, 0, 0u }, { -8, 0 } } },
-				}}
+				}
 			},
 			{ 
-				R"(database)"sv, toml::table{{
+				R"(database)"sv, toml::table{
 					{ R"(server)"sv, R"(192.168.1.1)"sv },
 					{ 
 						R"(ports)"sv, toml::array{
@@ -1102,26 +1102,26 @@ TEST_CASE("conformance - iarna/valid")
 					},
 					{ R"(connection_max)"sv, 5000 },
 					{ R"(enabled)"sv, true },
-				}}
+				}
 			},
 			{ 
-				R"(servers)"sv, toml::table{{
+				R"(servers)"sv, toml::table{
 					{ 
-						R"(alpha)"sv, toml::table{{
+						R"(alpha)"sv, toml::table{
 							{ R"(ip)"sv, R"(10.0.0.1)"sv },
 							{ R"(dc)"sv, R"(eqdc10)"sv },
-						}}
+						}
 					},
 					{ 
-						R"(beta)"sv, toml::table{{
+						R"(beta)"sv, toml::table{
 							{ R"(ip)"sv, R"(10.0.0.2)"sv },
 							{ R"(dc)"sv, R"(eqdc10)"sv },
-						}}
+						}
 					},
-				}}
+				}
 			},
 			{ 
-				R"(clients)"sv, toml::table{{
+				R"(clients)"sv, toml::table{
 					{ 
 						R"(data)"sv, toml::array{
 							toml::array{
@@ -1140,358 +1140,358 @@ TEST_CASE("conformance - iarna/valid")
 							R"(omega)"sv,
 						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_multiline_1, [](toml::table&& tbl) // spec-string-basic-multiline-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str1)"sv, R"(Roses are red
 Violets are blue)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_multiline_2, [](toml::table&& tbl) // spec-string-basic-multiline-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str)"sv, R"(The quick brown fox jumps over the lazy dog.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_multiline_3, [](toml::table&& tbl) // spec-string-basic-multiline-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str)"sv, R"(The quick brown fox jumps over the lazy dog.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_multiline_4, [](toml::table&& tbl) // spec-string-basic-multiline-4
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(a)"sv, R"(abcdef)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_multiline_5, [](toml::table&& tbl) // spec-string-basic-multiline-5
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(ml-escaped-nl)"sv, R"(  foo bar \
   baz \quux)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_multiline_6, [](toml::table&& tbl) // spec-string-basic-multiline-6
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str4)"sv, R"(Here are two quotation marks: "". Simple enough.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_multiline_7, [](toml::table&& tbl) // spec-string-basic-multiline-7
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str5)"sv, R"(Here are three quotation marks: """.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_multiline_8, [](toml::table&& tbl) // spec-string-basic-multiline-8
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str6)"sv, R"(Here are fifteen quotation marks: """"""""""""""".)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_multiline_9, [](toml::table&& tbl) // spec-string-basic-multiline-9
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str7)"sv, R"("This," she said, "is just a pointless statement.")"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_tab_multiline, [](toml::table&& tbl) // spec-string-basic-tab-multiline
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str)"sv, R"(This is a	tab)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic_tab, [](toml::table&& tbl) // spec-string-basic-tab
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str)"sv, R"(This is a	tab)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_literal_1, [](toml::table&& tbl) // spec-string-literal-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(winpath)"sv, R"(C:\Users\nodejs\templates)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_literal_2, [](toml::table&& tbl) // spec-string-literal-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(winpath2)"sv, R"(\\ServerX\admin$\system32\)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_literal_3, [](toml::table&& tbl) // spec-string-literal-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(quoted)"sv, R"(Tom "Dubs" Preston-Werner)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_literal_4, [](toml::table&& tbl) // spec-string-literal-4
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(regex)"sv, R"(<\i\c*\s*>)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_literal_multiline_1, [](toml::table&& tbl) // spec-string-literal-multiline-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(regex2)"sv, R"(I [dw]on't need \d{2} apples)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_literal_multiline_2, [](toml::table&& tbl) // spec-string-literal-multiline-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(lines)"sv, R"(The first newline is
 trimmed in raw strings.
    All other whitespace
    is preserved.
 )"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_literal_multiline_3, [](toml::table&& tbl) // spec-string-literal-multiline-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(quot15)"sv, R"(Here are fifteen quotation marks: """"""""""""""")"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_literal_multiline_4, [](toml::table&& tbl) // spec-string-literal-multiline-4
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str)"sv, R"('That,' she said, 'is still pointless.')"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_1, [](toml::table&& tbl) // spec-table-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(table-1)"sv, toml::table{{
+				R"(table-1)"sv, toml::table{
 					{ R"(key1)"sv, R"(some string)"sv },
 					{ R"(key2)"sv, 123 },
-				}}
+				}
 			},
 			{ 
-				R"(table-2)"sv, toml::table{{
+				R"(table-2)"sv, toml::table{
 					{ R"(key1)"sv, R"(another string)"sv },
 					{ R"(key2)"sv, 456 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_2, [](toml::table&& tbl) // spec-table-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(dog)"sv, toml::table{{
+				R"(dog)"sv, toml::table{
 					{ 
-						R"(tater.man)"sv, toml::table{{
+						R"(tater.man)"sv, toml::table{
 							{ 
-								R"(type)"sv, toml::table{{
+								R"(type)"sv, toml::table{
 									{ R"(name)"sv, R"(pug)"sv },
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_3, [](toml::table&& tbl) // spec-table-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(a)"sv, toml::table{{
+				R"(a)"sv, toml::table{
 					{ 
-						R"(b)"sv, toml::table{{
+						R"(b)"sv, toml::table{
 							{ R"(c)"sv, toml::table{} },
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_4, [](toml::table&& tbl) // spec-table-4
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(d)"sv, toml::table{{
+				R"(d)"sv, toml::table{
 					{ 
-						R"(e)"sv, toml::table{{
+						R"(e)"sv, toml::table{
 							{ R"(f)"sv, toml::table{} },
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_5, [](toml::table&& tbl) // spec-table-5
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(g)"sv, toml::table{{
+				R"(g)"sv, toml::table{
 					{ 
-						R"(h)"sv, toml::table{{
+						R"(h)"sv, toml::table{
 							{ R"(i)"sv, toml::table{} },
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_7, [](toml::table&& tbl) // spec-table-7
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(x)"sv, toml::table{{
+				R"(x)"sv, toml::table{
 					{ 
-						R"(y)"sv, toml::table{{
+						R"(y)"sv, toml::table{
 							{ 
-								R"(z)"sv, toml::table{{
+								R"(z)"sv, toml::table{
 									{ R"(w)"sv, toml::table{} },
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_8, [](toml::table&& tbl) // spec-table-8
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(fruit)"sv, toml::table{{
+				R"(fruit)"sv, toml::table{
 					{ 
-						R"(apple)"sv, toml::table{{
+						R"(apple)"sv, toml::table{
 							{ R"(color)"sv, R"(red)"sv },
 							{ 
-								R"(taste)"sv, toml::table{{
+								R"(taste)"sv, toml::table{
 									{ R"(sweet)"sv, true },
-								}}
+								}
 							},
 							{ 
-								R"(texture)"sv, toml::table{{
+								R"(texture)"sv, toml::table{
 									{ R"(smooth)"sv, true },
-								}}
+								}
 							},
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_inline_1, [](toml::table&& tbl) // spec-table-inline-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(name)"sv, toml::table{{
+				R"(name)"sv, toml::table{
 					{ R"(first)"sv, R"(Tom)"sv },
 					{ R"(last)"sv, R"(Preston-Werner)"sv },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_inline_2, [](toml::table&& tbl) // spec-table-inline-2
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(point)"sv, toml::table{{
+				R"(point)"sv, toml::table{
 					{ R"(x)"sv, 1 },
 					{ R"(y)"sv, 2 },
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_inline_3, [](toml::table&& tbl) // spec-table-inline-3
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(animal)"sv, toml::table{{
+				R"(animal)"sv, toml::table{
 					{ 
-						R"(type)"sv, toml::table{{
+						R"(type)"sv, toml::table{
 							{ R"(name)"sv, R"(pug)"sv },
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table, [](toml::table&& tbl) // spec-table
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(table)"sv, toml::table{} },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_time_1, [](toml::table&& tbl) // spec-time-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(lt1)"sv, toml::time{ 7, 32, 0, 0 } },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
@@ -1499,36 +1499,37 @@ trimmed in raw strings.
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_quoted_basic_keys_1, [](toml::table&& tbl) // spec-quoted-basic-keys-1
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(ʎǝʞ)"sv, R"(value)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_string_basic, [](toml::table&& tbl) // spec-string-basic
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ R"(str)"sv, R"(I'm a string. "You can quote me". Name	José
 Location	SF.)"sv },
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 	parsing_should_succeed(FILE_LINE_ARGS, spec_table_6, [](toml::table&& tbl) // spec-table-6
 	{
-		const auto expected = toml::table{{
+		const auto expected = toml::table{
 			{ 
-				R"(j)"sv, toml::table{{
+				R"(j)"sv, toml::table{
 					{ 
-						R"(ʞ)"sv, toml::table{{
+						R"(ʞ)"sv, toml::table{
 							{ R"(l)"sv, toml::table{} },
-						}}
+						}
 					},
-				}}
+				}
 			},
-		}};
+		};
 		REQUIRE(tbl == expected);
 	});
 
 #endif // UNICODE_LITERALS_OK
 }
+
diff --git a/tests/manipulating_tables.cpp b/tests/manipulating_tables.cpp
index 93276a43..539606bd 100644
--- a/tests/manipulating_tables.cpp
+++ b/tests/manipulating_tables.cpp
@@ -130,7 +130,7 @@ TEST_CASE("tables - construction")
 	}
 
 	{
-		table tbl{ { { "foo"sv, 42 } } };
+		table tbl{ { "foo"sv, 42 } };
 		CHECK(tbl.size() == 1u);
 		CHECK(!tbl.empty());
 		CHECK(tbl.begin() != tbl.end());
@@ -140,7 +140,7 @@ TEST_CASE("tables - construction")
 	}
 
 	{
-		table tbl{ { { "foo"sv, 42 }, { "bar"sv, 10.0 }, { "kek"sv, false }, { "qux"sv, array{ 1 } } } };
+		table tbl{ { "foo"sv, 42 }, { "bar"sv, 10.0 }, { "kek"sv, false }, { "qux"sv, array{ 1 } } };
 		CHECK(tbl.size() == 4u);
 		CHECK(!tbl.empty());
 		REQUIRE(tbl.get_as<int64_t>("foo"sv));
@@ -155,10 +155,10 @@ TEST_CASE("tables - construction")
 
 #if TOML_WINDOWS_COMPAT
 	{
-		table tbl{ { { L"foo", L"test1" },
-					 { L"bar"sv, L"test2"sv },
-					 { L"kek"s, L"test3"sv },
-					 { L"qux"sv.data(), L"test4"sv.data() } } };
+		table tbl{ { L"foo", L"test1" },
+				   { L"bar"sv, L"test2"sv },
+				   { L"kek"s, L"test3"sv },
+				   { L"qux"sv.data(), L"test4"sv.data() } };
 		CHECK(tbl.size() == 4u);
 		CHECK(!tbl.empty());
 		REQUIRE(tbl.get_as<std::string>("foo"sv));
@@ -177,26 +177,26 @@ TEST_CASE("tables - equality")
 {
 	static constexpr const char* one = "one";
 
-	table tbl1{ { { one, 1 }, { "two", 2 }, { "three", 3 } } };
+	table tbl1{ { one, 1 }, { "two", 2 }, { "three", 3 } };
 	CHECK(tbl1 == tbl1);
 
-	table tbl2{ { { "one"sv, 1 }, { "two"sv, 2 }, { "three"sv, 3 } } };
+	table tbl2{ { "one"sv, 1 }, { "two"sv, 2 }, { "three"sv, 3 } };
 	CHECK(tbl1 == tbl2);
 
-	table tbl3{ { { "one"sv, 1 }, { "two"sv, 2 } } };
+	table tbl3{ { "one"sv, 1 }, { "two"sv, 2 } };
 	CHECK(tbl1 != tbl3);
 
-	table tbl4{ { { "one"sv, 1 }, { "two"sv, 2 }, { "three"sv, 3 }, { "four"sv, 4 } } };
+	table tbl4{ { "one"sv, 1 }, { "two"sv, 2 }, { "three"sv, 3 }, { "four"sv, 4 } };
 	CHECK(tbl1 != tbl4);
 
-	table tbl5{ { { "one"sv, 1 }, { "two"sv, 2 }, { "three"sv, 3.0 } } };
+	table tbl5{ { "one"sv, 1 }, { "two"sv, 2 }, { "three"sv, 3.0 } };
 	CHECK(tbl1 != tbl5);
 
-	table tbl6{};
+	table tbl6;
 	CHECK(tbl1 != tbl6);
 	CHECK(tbl6 == tbl6);
 
-	table tbl7{};
+	table tbl7;
 	CHECK(tbl6 == tbl7);
 }
 
@@ -229,7 +229,7 @@ TEST_CASE("tables - insertion and erasure")
 	CHECK(!tbl.empty());
 	REQUIRE(tbl.get_as<int64_t>("a"sv));
 	CHECK(*tbl.get_as<int64_t>("a"sv) == 42);
-	REQUIRE(tbl == table{ { { "a"sv, 42 } } });
+	REQUIRE(tbl == table{ { "a"sv, 42 } });
 
 	res = tbl.insert("a", 69);
 	CHECK(res.first == tbl.begin());
@@ -237,7 +237,7 @@ TEST_CASE("tables - insertion and erasure")
 	CHECK(tbl.size() == 1u);
 	REQUIRE(tbl.get_as<int64_t>("a"));
 	CHECK(*tbl.get_as<int64_t>("a") == 42);
-	REQUIRE(tbl == table{ { { "a"sv, 42 } } });
+	REQUIRE(tbl == table{ { "a"sv, 42 } });
 
 	static constexpr const char* a = "a";
 	res							   = tbl.insert_or_assign(a, 69);
@@ -246,7 +246,7 @@ TEST_CASE("tables - insertion and erasure")
 	CHECK(tbl.size() == 1u);
 	REQUIRE(tbl.get_as<int64_t>("a"));
 	CHECK(*tbl.get_as<int64_t>("a") == 69);
-	REQUIRE(tbl == table{ { { "a"sv, 69 } } });
+	REQUIRE(tbl == table{ { "a"sv, 69 } });
 
 	res = tbl.insert_or_assign("b", "kek");
 	CHECK(res.first == advance(tbl.begin(), 1));
@@ -254,7 +254,7 @@ TEST_CASE("tables - insertion and erasure")
 	CHECK(tbl.size() == 2u);
 	REQUIRE(tbl.get_as<std::string>("b"));
 	CHECK(*tbl.get_as<std::string>("b") == "kek"sv);
-	REQUIRE(tbl == table{ { { "a"sv, 69 }, { "b"sv, "kek" } } });
+	REQUIRE(tbl == table{ { "a"sv, 69 }, { "b"sv, "kek" } });
 
 	res = tbl.emplace<array>("c", 1, 2, 3);
 	CHECK(res.first == advance(tbl.begin(), 2));
@@ -262,7 +262,7 @@ TEST_CASE("tables - insertion and erasure")
 	CHECK(tbl.size() == 3u);
 	REQUIRE(tbl.get_as<array>("c"));
 	CHECK(*tbl.get_as<array>("c") == array{ 1, 2, 3 });
-	REQUIRE(tbl == table{ { { "a"sv, 69 }, { "b"sv, "kek"sv }, { "c"sv, array{ 1, 2, 3 } } } });
+	REQUIRE(tbl == table{ { "a"sv, 69 }, { "b"sv, "kek"sv }, { "c"sv, array{ 1, 2, 3 } } });
 
 	res = tbl.emplace<int64_t>("c", 1);
 	CHECK(res.first == advance(tbl.begin(), 2));
@@ -270,7 +270,7 @@ TEST_CASE("tables - insertion and erasure")
 	CHECK(tbl.size() == 3u);
 	REQUIRE(!tbl.get_as<int64_t>("c"));
 	REQUIRE(tbl.get_as<array>("c"));
-	REQUIRE(tbl == table{ { { "a"sv, 69 }, { "b"sv, "kek"s }, { "c"sv, array{ 1, 2, 3 } } } });
+	REQUIRE(tbl == table{ { "a"sv, 69 }, { "b"sv, "kek"s }, { "c"sv, array{ 1, 2, 3 } } });
 
 	auto it = tbl.erase(tbl.cbegin());
 	REQUIRE(tbl == table{ { { "b"sv, "kek" }, { "c"sv, array{ 1, 2, 3 } } } });
@@ -283,10 +283,10 @@ TEST_CASE("tables - insertion and erasure")
 	CHECK(tbl.size() == 3u);
 	REQUIRE(tbl.get_as<int64_t>("a"));
 	CHECK(*tbl.get_as<int64_t>("a") == 69);
-	REQUIRE(tbl == table{ { { "a"sv, 69 }, { "b"sv, "kek" }, { "c"sv, array{ 1, 2, 3 } } } });
+	REQUIRE(tbl == table{ { "a"sv, 69 }, { "b"sv, "kek" }, { "c"sv, array{ 1, 2, 3 } } });
 
 	it = tbl.erase(advance(tbl.cbegin(), 1), advance(tbl.cbegin(), 3));
-	REQUIRE(tbl == table{ { { "a"sv, 69 } } });
+	REQUIRE(tbl == table{ { "a"sv, 69 } });
 	CHECK(it == tbl.end());
 	CHECK(tbl.size() == 1u);
 
diff --git a/tests/parsing_tables.cpp b/tests/parsing_tables.cpp
index 9acc3a4e..ebc050ea 100644
--- a/tests/parsing_tables.cpp
+++ b/tests/parsing_tables.cpp
@@ -24,14 +24,14 @@ TEST_CASE("parsing - tables")
 	//  Key/value pairs within tables are not guaranteed to be in any specific order."
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			[table-1]
-			key1 = "some string"
-			key2 = 123
-
-			[table-2]
-			key1 = "another string"
-			key2 = 456
-		)"sv,
+								[table-1]
+								key1 = "some string"
+								key2 = 123
+
+								[table-2]
+								key1 = "another string"
+								key2 = 456
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   REQUIRE(tbl["table-1"].as_table());
@@ -48,9 +48,9 @@ TEST_CASE("parsing - tables")
 	// "Naming rules for tables are the same as for keys." (i.e. can be quoted)
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			[dog."tater.man"]
-			type.name = "pug"
-		)"sv,
+								[dog."tater.man"]
+								type.name = "pug"
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   REQUIRE(tbl["dog"].as_table());
@@ -64,11 +64,11 @@ TEST_CASE("parsing - tables")
 	// "Whitespace around the key is ignored. However, best practice is to not use any extraneous whitespace."
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			[a.b.c]            # this is best practice
-			[ d.e.f ]          # same as [d.e.f]
-			[ g .  h  . i ]    # same as [g.h.i]
-			[ j . "k" . 'l' ]  # same as [j."k".'l']
-		)"sv,
+								[a.b.c]            # this is best practice
+								[ d.e.f ]          # same as [d.e.f]
+								[ g .  h  . i ]    # same as [g.h.i]
+								[ j . "k" . 'l' ]  # same as [j."k".'l']
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   CHECK(tbl["a"].as_table());
@@ -91,13 +91,13 @@ TEST_CASE("parsing - tables")
 	// "You don't need to specify all the super-tables if you don't want to. TOML knows how to do it for you."
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			# [x] you
-			# [x.y] don't
-			# [x.y.z] need these
-			[x.y.z.w] # for this to work
+								# [x] you
+								# [x.y] don't
+								# [x.y.z] need these
+								[x.y.z.w] # for this to work
 
-			[x] # defining a super-table afterwards is ok
-		)"sv,
+								[x] # defining a super-table afterwards is ok
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   CHECK(tbl["x"].as_table());
@@ -129,11 +129,11 @@ TEST_CASE("parsing - tables")
 	// "Defining tables out-of-order is discouraged."
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			# VALID BUT DISCOURAGED
-			[fruit.apple]
-			[animal]
-			[fruit.orange]
-		)"sv,
+								# VALID BUT DISCOURAGED
+								[fruit.apple]
+								[animal]
+								[fruit.orange]
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   CHECK(tbl["fruit"].as_table());
@@ -143,11 +143,11 @@ TEST_CASE("parsing - tables")
 						   });
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			# RECOMMENDED
-			[fruit.apple]
-			[fruit.orange]
-			[animal]
-		)"sv,
+								# RECOMMENDED
+								[fruit.apple]
+								[fruit.orange]
+								[animal]
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   CHECK(tbl["fruit"].as_table());
@@ -160,15 +160,15 @@ TEST_CASE("parsing - tables")
 	//  and ends just before the first table header (or EOF)."
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			# Top-level table begins.
-			name = "Fido"
-			breed = "pug"
-
-			# Top-level table ends.
-			[owner]
-			name = "Regina Dogman"
-			member_since = 1999-08-04
-		)"sv,
+								# Top-level table begins.
+								name = "Fido"
+								breed = "pug"
+
+								# Top-level table ends.
+								[owner]
+								name = "Regina Dogman"
+								member_since = 1999-08-04
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   CHECK(tbl["name"].as_string());
@@ -187,14 +187,14 @@ TEST_CASE("parsing - tables")
 	//  provided that such tables were not previously created."
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			fruit.apple.color = "red"
-			# Defines a table named fruit
-			# Defines a table named fruit.apple
-
-			fruit.apple.taste.sweet = true
-			# Defines a table named fruit.apple.taste
-			# fruit and fruit.apple were already created
-		)"sv,
+								fruit.apple.color = "red"
+								# Defines a table named fruit
+								# Defines a table named fruit.apple
+
+								fruit.apple.taste.sweet = true
+								# Defines a table named fruit.apple.taste
+								# fruit and fruit.apple were already created
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   CHECK(tbl["fruit"].as_table());
@@ -242,13 +242,13 @@ TEST_CASE("parsing - tables")
 	// "The [table] form can, however, be used to define sub-tables within tables defined via dotted keys."
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			[fruit]
-			apple.color = "red"
-			apple.taste.sweet = true
+								[fruit]
+								apple.color = "red"
+								apple.taste.sweet = true
 
-			[fruit.apple.texture]  # you can add sub-tables
-			smooth = true
-		)"sv,
+								[fruit.apple.texture]  # you can add sub-tables
+								smooth = true
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   CHECK(tbl["fruit"].as_table());
@@ -276,13 +276,13 @@ TEST_CASE("parsing - tables")
 	// see: https://github.com/toml-lang/toml/issues/769
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			[fruit.apple.texture]
-			smooth = true
+								[fruit.apple.texture]
+								smooth = true
 
-			[fruit]
-			apple.color = "red"
-			apple.taste.sweet = true
-		)"sv,
+								[fruit]
+								apple.color = "red"
+								apple.taste.sweet = true
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   CHECK(tbl["fruit"].as_table());
@@ -302,10 +302,10 @@ TEST_CASE("parsing - inline tables")
 
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-			name = { first = "Tom", last = "Preston-Werner" }
-			point = { x = 1, y = 2 }
-			animal = { type.name = "pug" }
-		)"sv,
+								name = { first = "Tom", last = "Preston-Werner" }
+								point = { x = 1, y = 2 }
+								animal = { type.name = "pug" }
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   REQUIRE(tbl["name"].as_table());
@@ -346,11 +346,11 @@ TEST_CASE("parsing - inline tables")
 	// "newlines are allowed between the curly braces [if] they are valid within a value."
 	parsing_should_succeed(FILE_LINE_ARGS,
 						   R"(
-test = { val1 = "foo", val2 = [
-	1, 2,
-	3
-], val3 = "bar" }
-)"sv,
+								test = { val1 = "foo", val2 = [
+									1, 2,
+									3
+								], val3 = "bar" }
+							)"sv,
 						   [](table&& tbl)
 						   {
 							   REQUIRE(tbl["test"].as_table());
@@ -369,11 +369,11 @@ test = { val1 = "foo", val2 = [
 	{
 		parsing_should_succeed(FILE_LINE_ARGS,
 							   R"(
-			name = {
-				first = "Tom",
-				last = "Preston-Werner",
-			}
-			)"sv,
+									name = {
+										first = "Tom",
+										last = "Preston-Werner",
+									}
+								)"sv,
 							   [](table&& tbl)
 							   {
 								   REQUIRE(tbl["name"].as_table());
diff --git a/tests/tests.h b/tests/tests.h
index ff2031b1..193e774a 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -201,7 +201,7 @@ inline bool parse_expected_value(std::string_view test_file,
 		end.column++;
 	}
 
-	using value_type = impl::native_type_of<impl::remove_cvref_t<T>>;
+	using value_type = impl::native_type_of<impl::remove_cvref<T>>;
 	value<value_type> val_parsed;
 	{
 		INFO("["sv << test_file << ", line "sv << test_line << "] "sv
diff --git a/tests/unicode.cpp b/tests/unicode.cpp
index 67a7ac8a..3f2916ff 100644
--- a/tests/unicode.cpp
+++ b/tests/unicode.cpp
@@ -52,7 +52,9 @@ struct codepoint_range
 
 	template <typename T>
 	TOML_NODISCARD_CTOR
-	constexpr codepoint_range(T first_) noexcept : first{ static_cast<char32_t>(first_) }, last{ first }
+	constexpr codepoint_range(T first_) noexcept //
+		: first{ static_cast<char32_t>(first_) },
+		  last{ first }
 	{}
 };
 
diff --git a/tests/user_feedback.cpp b/tests/user_feedback.cpp
index eed9a317..b1f9e312 100644
--- a/tests/user_feedback.cpp
+++ b/tests/user_feedback.cpp
@@ -13,10 +13,10 @@ TEST_CASE("user feedback")
 	{
 		toml::table t1;
 		t1.insert_or_assign("bar1", toml::array{ 1, 2, 3 });
-		CHECK(t1 == toml::table{ { { "bar1"sv, toml::array{ 1, 2, 3 } } } });
+		CHECK(t1 == toml::table{ { "bar1"sv, toml::array{ 1, 2, 3 } } });
 
 		t1.insert_or_assign("foo1", *t1.get("bar1"));
-		CHECK(t1 == toml::table{ { { "bar1"sv, toml::array{ 1, 2, 3 } }, { "foo1"sv, toml::array{ 1, 2, 3 } } } });
+		CHECK(t1 == toml::table{ { "bar1"sv, toml::array{ 1, 2, 3 } }, { "foo1"sv, toml::array{ 1, 2, 3 } } });
 
 		// t1["foo1"] = t1["bar1"]; // does nothing, should this fail to compile?
 		//  - yes -
@@ -26,28 +26,28 @@ TEST_CASE("user feedback")
 
 		toml::array* array1 = t1["foo1"].node()->as_array();
 		array1->push_back(4);
-		CHECK(t1 == toml::table{ { { "bar1"sv, toml::array{ 1, 2, 3 } }, { "foo1"sv, toml::array{ 1, 2, 3, 4 } } } });
+		CHECK(t1 == toml::table{ { "bar1"sv, toml::array{ 1, 2, 3 } }, { "foo1"sv, toml::array{ 1, 2, 3, 4 } } });
 
 		t1.insert_or_assign("foo3", t1["foo1"]);
 		CHECK(t1
-			  == toml::table{ { { "bar1"sv, toml::array{ 1, 2, 3 } },
-								{ "foo1"sv, toml::array{ 1, 2, 3, 4 } },
-								{ "foo3"sv, toml::array{ 1, 2, 3, 4 } } } });
+			  == toml::table{ { "bar1"sv, toml::array{ 1, 2, 3 } },
+							  { "foo1"sv, toml::array{ 1, 2, 3, 4 } },
+							  { "foo3"sv, toml::array{ 1, 2, 3, 4 } } });
 
 		t1.insert_or_assign("foo2", *t1["foo1"].node());
 		CHECK(t1
-			  == toml::table{ { { "bar1"sv, toml::array{ 1, 2, 3 } },
-								{ "foo1"sv, toml::array{ 1, 2, 3, 4 } },
-								{ "foo2"sv, toml::array{ 1, 2, 3, 4 } },
-								{ "foo3"sv, toml::array{ 1, 2, 3, 4 } } } });
+			  == toml::table{ { "bar1"sv, toml::array{ 1, 2, 3 } },
+							  { "foo1"sv, toml::array{ 1, 2, 3, 4 } },
+							  { "foo2"sv, toml::array{ 1, 2, 3, 4 } },
+							  { "foo3"sv, toml::array{ 1, 2, 3, 4 } } });
 
 		toml::array* array2 = t1["foo2"].node()->as_array();
 		array2->push_back("wrench");
 		CHECK(t1
-			  == toml::table{ { { "bar1"sv, toml::array{ 1, 2, 3 } },
-								{ "foo1"sv, toml::array{ 1, 2, 3, 4 } },
-								{ "foo2"sv, toml::array{ 1, 2, 3, 4, "wrench" } },
-								{ "foo3"sv, toml::array{ 1, 2, 3, 4 } } } });
+			  == toml::table{ { "bar1"sv, toml::array{ 1, 2, 3 } },
+							  { "foo1"sv, toml::array{ 1, 2, 3, 4 } },
+							  { "foo2"sv, toml::array{ 1, 2, 3, 4, "wrench" } },
+							  { "foo3"sv, toml::array{ 1, 2, 3, 4 } } });
 
 		toml::table t2 = t1;
 		CHECK(t2 == t1);
@@ -57,20 +57,20 @@ TEST_CASE("user feedback")
 		//  - it should be this: -
 		t2.emplace<toml::array>("bar", 6, 7);
 		CHECK(t2
-			  == toml::table{ { { "bar"sv, toml::array{ 6, 7 } },
-								{ "bar1"sv, toml::array{ 1, 2, 3 } },
-								{ "foo1"sv, toml::array{ 1, 2, 3, 4 } },
-								{ "foo2"sv, toml::array{ 1, 2, 3, 4, "wrench" } },
-								{ "foo3"sv, toml::array{ 1, 2, 3, 4 } } } });
+			  == toml::table{ { "bar"sv, toml::array{ 6, 7 } },
+							  { "bar1"sv, toml::array{ 1, 2, 3 } },
+							  { "foo1"sv, toml::array{ 1, 2, 3, 4 } },
+							  { "foo2"sv, toml::array{ 1, 2, 3, 4, "wrench" } },
+							  { "foo3"sv, toml::array{ 1, 2, 3, 4 } } });
 
 		t2.insert_or_assign("bar2", toml::array{ 6, 7 });
 		CHECK(t2
-			  == toml::table{ { { "bar"sv, toml::array{ 6, 7 } },
-								{ "bar1"sv, toml::array{ 1, 2, 3 } },
-								{ "bar2"sv, toml::array{ 6, 7 } },
-								{ "foo1"sv, toml::array{ 1, 2, 3, 4 } },
-								{ "foo2"sv, toml::array{ 1, 2, 3, 4, "wrench" } },
-								{ "foo3"sv, toml::array{ 1, 2, 3, 4 } } } });
+			  == toml::table{ { "bar"sv, toml::array{ 6, 7 } },
+							  { "bar1"sv, toml::array{ 1, 2, 3 } },
+							  { "bar2"sv, toml::array{ 6, 7 } },
+							  { "foo1"sv, toml::array{ 1, 2, 3, 4 } },
+							  { "foo2"sv, toml::array{ 1, 2, 3, 4, "wrench" } },
+							  { "foo3"sv, toml::array{ 1, 2, 3, 4 } } });
 	}
 
 	SECTION("github/issues/65") // https://github.com/marzer/tomlplusplus/issues/65
diff --git a/tests/using_iterators.cpp b/tests/using_iterators.cpp
index ba552bc8..fa47a436 100644
--- a/tests/using_iterators.cpp
+++ b/tests/using_iterators.cpp
@@ -12,42 +12,41 @@ number=5)"sv;
 	parsing_should_succeed(
 		FILE_LINE_ARGS,
 		data,
-		[](auto&& table)
+		[](auto&& tbl)
 		{
-			const auto table_begin = table.begin();
-			const auto table_end   = table.end();
+			const auto tbl_begin = tbl.begin();
+			const auto tbl_end	 = tbl.end();
 
-			auto count_table_lambda = [table_begin, table_end](node_type type) noexcept
-			{
-				return std::count_if(table_begin,
-									 table_end,
+			auto count_table_lambda = [tbl_begin, tbl_end](node_type type) noexcept {
+				return std::count_if(tbl_begin,
+									 tbl_end,
 									 [type](const auto& pair) noexcept { return pair.second.type() == type; });
 			};
 
-			CHECK(std::distance(table_begin, table_end) == 3);
+			CHECK(std::distance(tbl_begin, tbl_end) == 3);
 			CHECK(count_table_lambda(node_type::table) == 0);
 			CHECK(count_table_lambda(node_type::integer) == 1);
 			CHECK(count_table_lambda(node_type::string) == 1);
-			CHECK(std::next(table_begin, 3) == table_end);
+			CHECK(std::next(tbl_begin, 3) == tbl_end);
 
-			const auto array_iter =
-				std::find_if(table_begin, table_end, [](const auto& pair) noexcept { return pair.second.is_array(); });
+			const auto arr_iter =
+				std::find_if(tbl_begin, tbl_end, [](const auto& pair) noexcept { return pair.second.is_array(); });
 
-			REQUIRE(array_iter != table_end);
-			const auto& array	   = array_iter->second.as_array();
-			const auto array_begin = array->begin();
-			const auto array_end   = array->end();
+			REQUIRE(arr_iter != tbl_end);
+			const auto& arr		 = arr_iter->second.as_array();
+			const auto arr_begin = arr->begin();
+			const auto arr_end	 = arr->end();
 
-			auto count_array_lambda = [array_begin, array_end](node_type type) noexcept {
-				return std::count_if(array_begin,
-									 array_end,
+			auto count_array_lambda = [arr_begin, arr_end](node_type type) noexcept {
+				return std::count_if(arr_begin,
+									 arr_end,
 									 [type](const auto& node) noexcept { return node.type() == type; });
 			};
 
-			CHECK(std::distance(array_begin, array_end) == 3);
+			CHECK(std::distance(arr_begin, arr_end) == 3);
 			CHECK(count_array_lambda(node_type::table) == 0);
 			CHECK(count_array_lambda(node_type::integer) == 1);
 			CHECK(count_array_lambda(node_type::string) == 1);
-			CHECK(std::next(array_begin, 2) != array_end);
+			CHECK(std::next(arr_begin, 2) != arr_end);
 		});
 }
diff --git a/tests/windows_compat.cpp b/tests/windows_compat.cpp
index ec2819bf..db521ef6 100644
--- a/tests/windows_compat.cpp
+++ b/tests/windows_compat.cpp
@@ -27,7 +27,7 @@ TEST_CASE("windows compat")
 #if !TOML_EXCEPTIONS
 	REQUIRE(res.succeeded());
 #endif
-	toml::table& tbl = res;
+	table& tbl = res;
 
 	// source paths
 	REQUIRE(tbl.source().path != nullptr);
diff --git a/toml++.vcxproj b/toml++.vcxproj
index a11e29be..2259e3fa 100644
--- a/toml++.vcxproj
+++ b/toml++.vcxproj
@@ -61,6 +61,7 @@
     <ClInclude Include="include\toml++\impl\print_to_stream.inl" />
     <ClInclude Include="include\toml++\impl\source_region.h" />
     <ClInclude Include="include\toml++\impl\std_except.h" />
+    <ClInclude Include="include\toml++\impl\std_initializer_list.h" />
     <ClInclude Include="include\toml++\impl\std_map.h" />
     <ClInclude Include="include\toml++\impl\std_new.h" />
     <ClInclude Include="include\toml++\impl\std_optional.h" />
diff --git a/toml++.vcxproj.filters b/toml++.vcxproj.filters
index 218e69f0..2903b378 100644
--- a/toml++.vcxproj.filters
+++ b/toml++.vcxproj.filters
@@ -118,6 +118,9 @@
     <ClInclude Include="include\toml++\impl\value.inl">
       <Filter>include\impl</Filter>
     </ClInclude>
+    <ClInclude Include="include\toml++\impl\std_initializer_list.h">
+      <Filter>include\impl</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="toml++.props" />
diff --git a/toml.hpp b/toml.hpp
index 41a0e42e..97d83fb7 100644
--- a/toml.hpp
+++ b/toml.hpp
@@ -350,18 +350,26 @@
 #endif
 
 #ifdef DOXYGEN
-	#define TOML_HEADER_ONLY 0
+	#undef TOML_WINDOWS_COMPAT
 	#define TOML_WINDOWS_COMPAT 1
 #endif
 
-#if defined(TOML_ALL_INLINE) && !defined(TOML_HEADER_ONLY)
-	#define TOML_HEADER_ONLY	TOML_ALL_INLINE
-#endif
-
 #if !defined(TOML_HEADER_ONLY) || (defined(TOML_HEADER_ONLY) && TOML_HEADER_ONLY) || TOML_INTELLISENSE
 	#undef TOML_HEADER_ONLY
 	#define TOML_HEADER_ONLY 1
 #endif
+#ifdef DOXYGEN
+	#undef TOML_HEADER_ONLY
+	#define TOML_HEADER_ONLY 0
+#endif
+
+#ifndef TOML_EXTERN_TEMPLATES
+	#define TOML_EXTERN_TEMPLATES 1
+#endif
+#if (defined(DOXYGEN) || TOML_HEADER_ONLY) && !TOML_INTELLISENSE
+	#undef TOML_EXTERN_TEMPLATES
+	#define TOML_EXTERN_TEMPLATES 0
+#endif
 
 #if defined(TOML_IMPLEMENTATION) || TOML_HEADER_ONLY
 	#undef TOML_IMPLEMENTATION
@@ -386,7 +394,8 @@
 	#define TOML_UNDEF_MACROS 1
 #endif
 
-#ifndef TOML_PARSER
+#if !defined(TOML_PARSER) || (defined(TOML_PARSER) && TOML_PARSER) || TOML_INTELLISENSE
+	#undef TOML_PARSER
 	#define TOML_PARSER 1
 #endif
 
@@ -396,7 +405,8 @@
 	// 256 is crazy high! if you're hitting this limit with real input, TOML is probably the wrong tool for the job...
 #endif
 
-#ifndef TOML_WINDOWS_COMPAT
+#if !defined(TOML_WINDOWS_COMPAT) || (defined(TOML_WINDOWS_COMPAT) && TOML_WINDOWS_COMPAT) || TOML_INTELLISENSE
+	#undef TOML_WINDOWS_COMPAT
 	#define TOML_WINDOWS_COMPAT 1
 #endif
 
@@ -427,6 +437,10 @@
 	#endif
 #endif
 
+#ifdef TOML_ALL_INLINE
+	#error Support for TOML_ALL_INLINE was deprecated in toml++ 2.0.0 and removed in 3.0.0. Use TOML_HEADER_ONLY instead.
+#endif
+
 #ifndef TOML_CPP_VERSION
 	#define TOML_CPP_VERSION __cplusplus
 #endif
@@ -465,12 +479,6 @@
 	#define TOML_EXCEPTIONS	0
 #endif
 
-#if defined(DOXYGEN) || TOML_EXCEPTIONS
-	#define TOML_MAY_THROW
-#else
-	#define TOML_MAY_THROW				noexcept
-#endif
-
 #if TOML_GCC || TOML_CLANG || (TOML_ICC && !TOML_ICC_CL)
 	// not supported by any version of GCC or Clang as of 26/11/2020
 	// not supported by any version of ICC on Linux as of 11/01/2021
@@ -650,10 +658,10 @@
 	#define POXY_IMPLEMENTATION_DETAIL(...) __VA_ARGS__
 #endif
 
-#if (!defined(DOXYGEN) && !TOML_HEADER_ONLY) || TOML_INTELLISENSE
-	#define TOML_EXTERN_TEMPLATES 1
+#if TOML_CLANG
+	#define TOML_EXTERN_NOEXCEPT(...)
 #else
-	#define TOML_EXTERN_TEMPLATES 0
+	#define TOML_EXTERN_NOEXCEPT(...) noexcept(__VA_ARGS__)
 #endif
 
 // SFINAE
@@ -885,17 +893,17 @@ TOML_IMPL_NAMESPACE_START
 {
 	TOML_NODISCARD
 	TOML_API
-	std::string narrow(std::wstring_view) noexcept;
+	std::string narrow(std::wstring_view);
 
 	TOML_NODISCARD
 	TOML_API
-	std::wstring widen(std::string_view) noexcept;
+	std::wstring widen(std::string_view);
 
 #if TOML_HAS_CHAR8
 
 	TOML_NODISCARD
 	TOML_API
-	std::wstring widen(std::u8string_view) noexcept;
+	std::wstring widen(std::u8string_view);
 
 #endif
 }
@@ -1166,7 +1174,7 @@ TOML_NAMESPACE_END;
 TOML_IMPL_NAMESPACE_START
 {
 	template <typename T>
-	using remove_cvref_t = std::remove_cv_t<std::remove_reference_t<T>>;
+	using remove_cvref = std::remove_cv_t<std::remove_reference_t<T>>;
 
 	template <typename T, typename... U>
 	inline constexpr bool is_one_of = (false || ... || std::is_same_v<T, U>);
@@ -1178,6 +1186,14 @@ TOML_IMPL_NAMESPACE_START
 	inline constexpr bool is_wide_string =
 		is_one_of<std::decay_t<T>, const wchar_t*, wchar_t*, std::wstring_view, std::wstring>;
 
+	template <typename T>
+	static constexpr bool value_retrieval_is_nothrow = !std::is_same_v<remove_cvref<T>, std::string>
+#if TOML_HAS_CHAR8
+													&& !std::is_same_v<remove_cvref<T>, std::u8string>
+#endif
+
+													&& !is_wide_string<T>;
+
 	template <typename T>
 	inline constexpr bool dependent_false = false;
 
@@ -1598,44 +1614,44 @@ TOML_IMPL_NAMESPACE_START
 		static constexpr auto value = node_type::none;
 	};
 	template <typename T>
-	inline constexpr node_type node_type_of = node_type_getter<unwrap_node<remove_cvref_t<T>>>::value;
+	inline constexpr node_type node_type_of = node_type_getter<unwrap_node<remove_cvref<T>>>::value;
 }
 TOML_IMPL_NAMESPACE_END;
 
 TOML_NAMESPACE_START
 {
 	template <typename T>
-	inline constexpr bool is_table = std::is_same_v<impl::remove_cvref_t<T>, table>;
+	inline constexpr bool is_table = std::is_same_v<impl::remove_cvref<T>, table>;
 
 	template <typename T>
-	inline constexpr bool is_array = std::is_same_v<impl::remove_cvref_t<T>, array>;
+	inline constexpr bool is_array = std::is_same_v<impl::remove_cvref<T>, array>;
 
 	template <typename T>
 	inline constexpr bool is_container = is_table<T> || is_array<T>;
 
 	template <typename T>
-	inline constexpr bool is_string = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<std::string>>;
+	inline constexpr bool is_string = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<std::string>>;
 
 	template <typename T>
-	inline constexpr bool is_integer = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<int64_t>>;
+	inline constexpr bool is_integer = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<int64_t>>;
 
 	template <typename T>
-	inline constexpr bool is_floating_point = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<double>>;
+	inline constexpr bool is_floating_point = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<double>>;
 
 	template <typename T>
 	inline constexpr bool is_number = is_integer<T> || is_floating_point<T>;
 
 	template <typename T>
-	inline constexpr bool is_boolean = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<bool>>;
+	inline constexpr bool is_boolean = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<bool>>;
 
 	template <typename T>
-	inline constexpr bool is_date = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<date>>;
+	inline constexpr bool is_date = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<date>>;
 
 	template <typename T>
-	inline constexpr bool is_time = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<time>>;
+	inline constexpr bool is_time = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<time>>;
 
 	template <typename T>
-	inline constexpr bool is_date_time = std::is_same_v<impl::wrap_node<impl::remove_cvref_t<T>>, value<date_time>>;
+	inline constexpr bool is_date_time = std::is_same_v<impl::wrap_node<impl::remove_cvref<T>>, value<date_time>>;
 
 	template <typename T>
 	inline constexpr bool is_chronological = is_date<T> || is_time<T> || is_date_time<T>;
@@ -1645,11 +1661,10 @@ TOML_NAMESPACE_START
 
 	template <typename T>
 	inline constexpr bool is_node =
-		std::is_same_v<toml::node, impl::remove_cvref_t<T>> || std::is_base_of_v<toml::node, impl::remove_cvref_t<T>>;
+		std::is_same_v<toml::node, impl::remove_cvref<T>> || std::is_base_of_v<toml::node, impl::remove_cvref<T>>;
 
 	template <typename T>
-	inline constexpr bool is_node_view =
-		impl::is_one_of<impl::remove_cvref_t<T>, node_view<node>, node_view<const node>>;
+	inline constexpr bool is_node_view = impl::is_one_of<impl::remove_cvref<T>, node_view<node>, node_view<const node>>;
 }
 TOML_NAMESPACE_END;
 
@@ -2235,7 +2250,7 @@ TOML_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		decltype(auto) get_value_exact() const noexcept;
+		decltype(auto) get_value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>);
 
 		template <typename T, typename N>
 		TOML_NODISCARD
@@ -2598,15 +2613,15 @@ TOML_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		optional<T> value_exact() const noexcept;
+		optional<T> value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>);
 
 		template <typename T>
 		TOML_NODISCARD
-		optional<T> value() const noexcept;
+		optional<T> value() const noexcept(impl::value_retrieval_is_nothrow<T>);
 
 		template <typename T>
 		TOML_NODISCARD
-		auto value_or(T&& default_value) const noexcept;
+		auto value_or(T&& default_value) const noexcept(impl::value_retrieval_is_nothrow<T>);
 
 		template <typename T>
 		TOML_NODISCARD
@@ -2828,6 +2843,7 @@ TOML_POP_WARNINGS;
 TOML_DISABLE_WARNINGS;
 #include <vector>
 #include <iterator>
+#include <initializer_list>
 TOML_ENABLE_WARNINGS;
 
 TOML_PUSH_WARNINGS;
@@ -3065,7 +3081,7 @@ TOML_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		optional<T> value_exact() const noexcept
+		optional<T> value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>)
 		{
 			if (node_)
 				return node_->template value_exact<T>();
@@ -3074,7 +3090,7 @@ TOML_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		optional<T> value() const noexcept
+		optional<T> value() const noexcept(impl::value_retrieval_is_nothrow<T>)
 		{
 			if (node_)
 				return node_->template value<T>();
@@ -3083,7 +3099,7 @@ TOML_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		auto value_or(T&& default_value) const noexcept
+		auto value_or(T&& default_value) const noexcept(impl::value_retrieval_is_nothrow<T>)
 		{
 			using namespace ::toml::impl;
 
@@ -3172,7 +3188,7 @@ TOML_NAMESPACE_START
 
 		TOML_CONSTRAINED_TEMPLATE((impl::is_native<T> || impl::is_losslessly_convertible_to_native<T>), typename T)
 		TOML_NODISCARD
-		friend bool operator==(const node_view& lhs, const T& rhs) noexcept
+		friend bool operator==(const node_view& lhs, const T& rhs) noexcept(!impl::is_wide_string<T>)
 		{
 			static_assert(!impl::is_wide_string<T> || TOML_WINDOWS_COMPAT,
 						  "Comparison with wide-character strings is only "
@@ -3200,7 +3216,8 @@ TOML_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		friend bool operator==(const node_view& lhs, const std::initializer_list<T>& rhs) noexcept
+		friend bool operator==(const node_view& lhs,
+							   const std::initializer_list<T>& rhs) noexcept(!impl::is_wide_string<T>)
 		{
 			const auto arr = lhs.as<array>();
 			return arr && *arr == rhs;
@@ -3209,7 +3226,7 @@ TOML_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		friend bool operator==(const node_view& lhs, const std::vector<T>& rhs) noexcept
+		friend bool operator==(const node_view& lhs, const std::vector<T>& rhs) noexcept(!impl::is_wide_string<T>)
 		{
 			const auto arr = lhs.as<array>();
 			return arr && *arr == rhs;
@@ -3227,7 +3244,7 @@ TOML_NAMESPACE_START
 #if TOML_WINDOWS_COMPAT
 
 		TOML_NODISCARD
-		node_view operator[](std::wstring_view key) const noexcept
+		node_view operator[](std::wstring_view key) const
 		{
 			if (auto tbl = this->as_table())
 				return node_view{ tbl->get(key) };
@@ -3271,9 +3288,9 @@ TOML_NAMESPACE_START
 
 #define TOML_EXTERN(name, T)                                                                                           \
 	extern template TOML_API                                                                                           \
-	optional<T> node_view<node>::name<T>() const noexcept;                                                             \
+	optional<T> node_view<node>::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>);            \
 	extern template TOML_API                                                                                           \
-	optional<T> node_view<const node>::name<T>() const noexcept
+	optional<T> node_view<const node>::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>)
 
 	TOML_EXTERN(value_exact, std::string_view);
 	TOML_EXTERN(value_exact, std::string);
@@ -3438,7 +3455,7 @@ TOML_IMPL_NAMESPACE_START
 #if TOML_HAS_CHAR8
 			if constexpr (is_one_of<std::decay_t<T>, char8_t*, const char8_t*>)
 				return std::string(reinterpret_cast<const char*>(static_cast<const char8_t*>(arg)));
-			else if constexpr (is_one_of<remove_cvref_t<T>, std::u8string, std::u8string_view>)
+			else if constexpr (is_one_of<remove_cvref<T>, std::u8string, std::u8string_view>)
 				return std::string(reinterpret_cast<const char*>(static_cast<const char8_t*>(arg.data())),
 								   arg.length());
 #endif // TOML_HAS_CHAR8
@@ -4012,11 +4029,11 @@ TOML_NAMESPACE_START
 	};
 
 	template <typename T>
-	value(T) -> value<impl::native_type_of<impl::remove_cvref_t<T>>>;
+	value(T) -> value<impl::native_type_of<impl::remove_cvref<T>>>;
 
 	template <typename T>
 	TOML_NODISCARD
-	inline decltype(auto) node::get_value_exact() const noexcept
+	inline decltype(auto) node::get_value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>)
 	{
 		using namespace impl;
 
@@ -4064,7 +4081,7 @@ TOML_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	inline optional<T> node::value_exact() const noexcept
+	inline optional<T> node::value_exact() const noexcept(impl::value_retrieval_is_nothrow<T>)
 	{
 		using namespace impl;
 
@@ -4087,7 +4104,7 @@ TOML_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	inline optional<T> node::value() const noexcept
+	inline optional<T> node::value() const noexcept(impl::value_retrieval_is_nothrow<T>)
 	{
 		using namespace impl;
 
@@ -4204,7 +4221,7 @@ TOML_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	inline auto node::value_or(T && default_value) const noexcept
+	inline auto node::value_or(T && default_value) const noexcept(impl::value_retrieval_is_nothrow<T>)
 	{
 		using namespace impl;
 
@@ -4306,7 +4323,7 @@ TOML_NAMESPACE_START
 
 #define TOML_EXTERN(name, T)                                                                                           \
 	extern template TOML_API                                                                                           \
-	optional<T> node::name<T>() const noexcept
+	optional<T> node::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>)
 
 	TOML_EXTERN(value_exact, std::string_view);
 	TOML_EXTERN(value_exact, std::string);
@@ -4370,9 +4387,9 @@ TOML_IMPL_NAMESPACE_START
 	template <typename T>
 	TOML_NODISCARD
 	TOML_ATTR(returns_nonnull)
-	auto* make_node_specialized(T && val) noexcept
+	auto* make_node_specialized(T && val)
 	{
-		using type = unwrap_node<remove_cvref_t<T>>;
+		using type = unwrap_node<remove_cvref<T>>;
 		static_assert(!std::is_same_v<type, node>);
 		static_assert(!is_node_view<type>);
 
@@ -4380,7 +4397,7 @@ TOML_IMPL_NAMESPACE_START
 		{
 			return new type{ static_cast<T&&>(val) };
 		}
-		else if constexpr (is_native<type> && !std::is_same_v<remove_cvref_t<T>, type>)
+		else if constexpr (is_native<type> && !std::is_same_v<remove_cvref<T>, type>)
 		{
 			return new value<type>{ static_cast<T&&>(val) };
 		}
@@ -4392,7 +4409,7 @@ TOML_IMPL_NAMESPACE_START
 			static_assert(is_native<type> || is_losslessly_convertible_to_native<type>,
 						  "Value initializers must be (or be promotable to) one of the TOML value types");
 
-			using value_type = native_type_of<remove_cvref_t<T>>;
+			using value_type = native_type_of<remove_cvref<T>>;
 			if constexpr (is_wide_string<T>)
 			{
 #if TOML_WINDOWS_COMPAT
@@ -4408,9 +4425,9 @@ TOML_IMPL_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	auto* make_node(T && val) noexcept
+	auto* make_node(T && val)
 	{
-		using type = unwrap_node<remove_cvref_t<T>>;
+		using type = unwrap_node<remove_cvref<T>>;
 		if constexpr (std::is_same_v<type, node> || is_node_view<type>)
 		{
 			if constexpr (is_node_view<type>)
@@ -4420,7 +4437,7 @@ TOML_IMPL_NAMESPACE_START
 			}
 
 			return static_cast<T&&>(val).visit(
-				[](auto&& concrete) noexcept {
+				[](auto&& concrete) {
 					return static_cast<toml::node*>(make_node_specialized(static_cast<decltype(concrete)&&>(concrete)));
 				});
 		}
@@ -4430,7 +4447,7 @@ TOML_IMPL_NAMESPACE_START
 
 	template <typename T>
 	TOML_NODISCARD
-	auto* make_node(inserter<T> && val) noexcept
+	auto* make_node(inserter<T> && val)
 	{
 		return make_node(static_cast<T&&>(val.value));
 	}
@@ -4458,8 +4475,7 @@ TOML_IMPL_NAMESPACE_END;
 TOML_NAMESPACE_START
 {
 	template <typename T>
-	using inserted_type_of =
-		POXY_IMPLEMENTATION_DETAIL(typename impl::inserted_type_of_<impl::remove_cvref_t<T>>::type);
+	using inserted_type_of = POXY_IMPLEMENTATION_DETAIL(typename impl::inserted_type_of_<impl::remove_cvref<T>>::type);
 }
 TOML_NAMESPACE_END;
 
@@ -4474,10 +4490,10 @@ TOML_DISABLE_SWITCH_WARNINGS;
 TOML_IMPL_NAMESPACE_START
 {
 	template <bool IsConst>
-	class TOML_TRIVIAL_ABI array_iterator final
+	class TOML_TRIVIAL_ABI array_iterator
 	{
 	  private:
-		template <bool C>
+		template <bool>
 		friend class array_iterator;
 		friend class TOML_NAMESPACE::array;
 
@@ -4657,10 +4673,10 @@ TOML_NAMESPACE_START
 		std::vector<std::unique_ptr<node>> elements;
 
 		TOML_API
-		void preinsertion_resize(size_t idx, size_t count) noexcept;
+		void preinsertion_resize(size_t idx, size_t count);
 
 		template <typename T>
-		void emplace_back_if_not_empty_view(T&& val) noexcept
+		void emplace_back_if_not_empty_view(T&& val)
 		{
 			if constexpr (is_node_view<T>)
 			{
@@ -4710,19 +4726,19 @@ TOML_NAMESPACE_START
 
 		TOML_NODISCARD_CTOR
 		TOML_API
-		array(const array&) noexcept;
+		array(const array&);
 
 		TOML_NODISCARD_CTOR
 		TOML_API
 		array(array&& other) noexcept;
 
 		TOML_API
-		array& operator=(const array&) noexcept;
+		array& operator=(const array&);
 
 		TOML_API
 		array& operator=(array&& rhs) noexcept;
 
-		TOML_CONSTRAINED_TEMPLATE((sizeof...(ElemTypes) > 0 || !std::is_same_v<impl::remove_cvref_t<ElemType>, array>),
+		TOML_CONSTRAINED_TEMPLATE((sizeof...(ElemTypes) > 0 || !std::is_same_v<impl::remove_cvref<ElemType>, array>),
 								  typename ElemType,
 								  typename... ElemTypes)
 		TOML_NODISCARD_CTOR
@@ -4907,7 +4923,7 @@ TOML_NAMESPACE_START
 		}
 
 		template <typename ElemType>
-		iterator insert(const_iterator pos, ElemType&& val) noexcept
+		iterator insert(const_iterator pos, ElemType&& val)
 		{
 			if constexpr (is_node_view<ElemType>)
 			{
@@ -4918,7 +4934,7 @@ TOML_NAMESPACE_START
 		}
 
 		template <typename ElemType>
-		iterator insert(const_iterator pos, size_t count, ElemType&& val) noexcept
+		iterator insert(const_iterator pos, size_t count, ElemType&& val)
 		{
 			if constexpr (is_node_view<ElemType>)
 			{
@@ -4944,7 +4960,7 @@ TOML_NAMESPACE_START
 		}
 
 		template <typename Iter>
-		iterator insert(const_iterator pos, Iter first, Iter last) noexcept
+		iterator insert(const_iterator pos, Iter first, Iter last)
 		{
 			const auto distance = std::distance(first, last);
 			if (distance <= 0)
@@ -4981,13 +4997,13 @@ TOML_NAMESPACE_START
 		}
 
 		template <typename ElemType>
-		iterator insert(const_iterator pos, std::initializer_list<ElemType> ilist) noexcept
+		iterator insert(const_iterator pos, std::initializer_list<ElemType> ilist)
 		{
 			return insert(pos, ilist.begin(), ilist.end());
 		}
 
 		template <typename ElemType, typename... Args>
-		iterator emplace(const_iterator pos, Args&&... args) noexcept
+		iterator emplace(const_iterator pos, Args&&... args)
 		{
 			using type = impl::unwrap_node<ElemType>;
 			static_assert((impl::is_native<type> || impl::is_one_of<type, table, array>)&&!impl::is_cvref<type>,
@@ -5007,7 +5023,7 @@ TOML_NAMESPACE_START
 		}
 
 		template <typename ElemType>
-		void resize(size_t new_size, ElemType&& default_init_val) noexcept
+		void resize(size_t new_size, ElemType&& default_init_val)
 		{
 			static_assert(!is_node_view<ElemType>,
 						  "The default element type argument to toml::array::resize may not be toml::node_view.");
@@ -5027,13 +5043,13 @@ TOML_NAMESPACE_START
 		}
 
 		template <typename ElemType>
-		void push_back(ElemType&& val) noexcept
+		void push_back(ElemType&& val)
 		{
 			emplace_back_if_not_empty_view(static_cast<ElemType&&>(val));
 		}
 
 		template <typename ElemType, typename... Args>
-		decltype(auto) emplace_back(Args&&... args) noexcept
+		decltype(auto) emplace_back(Args&&... args)
 		{
 			using type = impl::unwrap_node<ElemType>;
 			static_assert((impl::is_native<type> || impl::is_one_of<type, table, array>)&&!impl::is_cvref<type>,
@@ -5173,7 +5189,7 @@ TOML_DISABLE_SWITCH_WARNINGS;
 TOML_IMPL_NAMESPACE_START
 {
 	template <bool IsConst>
-	struct table_proxy_pair final
+	struct table_proxy_pair
 	{
 		using value_type = std::conditional_t<IsConst, const node, node>;
 
@@ -5182,10 +5198,10 @@ TOML_IMPL_NAMESPACE_START
 	};
 
 	template <bool IsConst>
-	class table_iterator final
+	class table_iterator
 	{
 	  private:
-		template <bool C>
+		template <bool>
 		friend class table_iterator;
 		friend class TOML_NAMESPACE::table;
 
@@ -5310,28 +5326,28 @@ TOML_IMPL_NAMESPACE_START
 		TOML_ENABLE_WARNINGS;
 	};
 
-	struct table_init_pair final
+	struct table_init_pair
 	{
-		std::string key;
-		std::unique_ptr<node> value;
+		mutable std::string key;
+		mutable std::unique_ptr<node> value;
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(std::string&& k, V&& v) noexcept //
+		table_init_pair(std::string&& k, V&& v) //
 			: key{ std::move(k) },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(std::string_view k, V&& v) noexcept //
+		table_init_pair(std::string_view k, V&& v) //
 			: key{ k },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(const char* k, V&& v) noexcept //
+		table_init_pair(const char* k, V&& v) //
 			: key{ k },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
@@ -5340,21 +5356,21 @@ TOML_IMPL_NAMESPACE_START
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(std::wstring&& k, V&& v) noexcept //
+		table_init_pair(std::wstring&& k, V&& v) //
 			: key{ narrow(k) },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(std::wstring_view k, V&& v) noexcept //
+		table_init_pair(std::wstring_view k, V&& v) //
 			: key{ narrow(k) },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
 
 		template <typename V>
 		TOML_NODISCARD_CTOR
-		table_init_pair(const wchar_t* k, V&& v) noexcept //
+		table_init_pair(const wchar_t* k, V&& v) //
 			: key{ narrow(std::wstring_view{ k }) },
 			  value{ make_node(static_cast<V&&>(v)) }
 		{}
@@ -5381,11 +5397,11 @@ TOML_NAMESPACE_START
 
 		TOML_NODISCARD_CTOR
 		TOML_API
-		table(impl::table_init_pair*, size_t) noexcept;
+		table(const impl::table_init_pair*, const impl::table_init_pair*);
 
 		template <typename Map, typename Key>
 		TOML_NODISCARD
-		static auto do_get(Map& vals, const Key& key) noexcept
+		static auto do_get(Map& vals, const Key& key) noexcept(!impl::is_wide_string<Key>)
 			-> std::conditional_t<std::is_const_v<Map>, const node*, node*>
 		{
 			static_assert(
@@ -5451,28 +5467,23 @@ TOML_NAMESPACE_START
 
 		TOML_NODISCARD_CTOR
 		TOML_API
-		table(const table&) noexcept;
+		table(const table&);
 
 		TOML_NODISCARD_CTOR
 		TOML_API
 		table(table&& other) noexcept;
 
+		TOML_NODISCARD_CTOR
+		explicit table(std::initializer_list<impl::table_init_pair> kvps) //
+			: table{ kvps.begin(), kvps.end() }
+		{}
+
 		TOML_API
-		table& operator=(const table&) noexcept;
+		table& operator=(const table&);
 
 		TOML_API
 		table& operator=(table&& rhs) noexcept;
 
-		template <size_t N>
-		TOML_NODISCARD_CTOR
-		explicit table(impl::table_init_pair(&&arr)[N]) noexcept //
-			: table{ arr, N }
-		{
-#if TOML_LIFETIME_HOOKS
-			TOML_TABLE_CREATED;
-#endif
-		}
-
 		TOML_NODISCARD
 		node_type type() const noexcept final
 		{
@@ -5619,7 +5630,7 @@ TOML_NAMESPACE_START
 		TOML_CONSTRAINED_TEMPLATE((std::is_convertible_v<KeyType&&, std::string_view> || impl::is_wide_string<KeyType>),
 								  typename KeyType,
 								  typename ValueType)
-		std::pair<iterator, bool> insert(KeyType&& key, ValueType&& val) noexcept
+		std::pair<iterator, bool> insert(KeyType&& key, ValueType&& val)
 		{
 			static_assert(
 				!impl::is_wide_string<KeyType> || TOML_WINDOWS_COMPAT,
@@ -5655,7 +5666,7 @@ TOML_NAMESPACE_START
 
 		TOML_CONSTRAINED_TEMPLATE((!std::is_convertible_v<Iter, std::string_view> && !impl::is_wide_string<Iter>),
 								  typename Iter)
-		void insert(Iter first, Iter last) noexcept
+		void insert(Iter first, Iter last)
 		{
 			if (first == last)
 				return;
@@ -5669,7 +5680,7 @@ TOML_NAMESPACE_START
 		}
 
 		template <typename KeyType, typename ValueType>
-		std::pair<iterator, bool> insert_or_assign(KeyType&& key, ValueType&& val) noexcept
+		std::pair<iterator, bool> insert_or_assign(KeyType&& key, ValueType&& val)
 		{
 			static_assert(
 				!impl::is_wide_string<KeyType> || TOML_WINDOWS_COMPAT,
@@ -5708,7 +5719,7 @@ TOML_NAMESPACE_START
 		}
 
 		template <typename ValueType, typename KeyType, typename... ValueArgs>
-		std::pair<iterator, bool> emplace(KeyType&& key, ValueArgs&&... args) noexcept
+		std::pair<iterator, bool> emplace(KeyType&& key, ValueArgs&&... args)
 		{
 			static_assert(
 				!impl::is_wide_string<KeyType> || TOML_WINDOWS_COMPAT,
@@ -5768,7 +5779,7 @@ TOML_NAMESPACE_START
 
 #if TOML_WINDOWS_COMPAT
 
-		bool erase(std::wstring_view key) noexcept
+		bool erase(std::wstring_view key)
 		{
 			return erase(impl::narrow(key));
 		}
@@ -5796,19 +5807,19 @@ TOML_NAMESPACE_START
 #if TOML_WINDOWS_COMPAT
 
 		TOML_NODISCARD
-		iterator find(std::wstring_view key) noexcept
+		iterator find(std::wstring_view key)
 		{
 			return find(impl::narrow(key));
 		}
 
 		TOML_NODISCARD
-		const_iterator find(std::wstring_view key) const noexcept
+		const_iterator find(std::wstring_view key) const
 		{
 			return find(impl::narrow(key));
 		}
 
 		TOML_NODISCARD
-		bool contains(std::wstring_view key) const noexcept
+		bool contains(std::wstring_view key) const
 		{
 			return contains(impl::narrow(key));
 		}
@@ -5830,13 +5841,13 @@ TOML_NAMESPACE_START
 #if TOML_WINDOWS_COMPAT
 
 		TOML_NODISCARD
-		node* get(std::wstring_view key) noexcept
+		node* get(std::wstring_view key)
 		{
 			return get(impl::narrow(key));
 		}
 
 		TOML_NODISCARD
-		const node* get(std::wstring_view key) const noexcept
+		const node* get(std::wstring_view key) const
 		{
 			return get(impl::narrow(key));
 		}
@@ -5861,14 +5872,14 @@ TOML_NAMESPACE_START
 
 		template <typename ValueType>
 		TOML_NODISCARD
-		impl::wrap_node<ValueType>* get_as(std::wstring_view key) noexcept
+		impl::wrap_node<ValueType>* get_as(std::wstring_view key)
 		{
 			return get_as<ValueType>(impl::narrow(key));
 		}
 
 		template <typename ValueType>
 		TOML_NODISCARD
-		const impl::wrap_node<ValueType>* get_as(std::wstring_view key) const noexcept
+		const impl::wrap_node<ValueType>* get_as(std::wstring_view key) const
 		{
 			return get_as<ValueType>(impl::narrow(key));
 		}
@@ -6021,7 +6032,7 @@ TOML_IMPL_NAMESPACE_START
 	TOML_ATTR(const)
 	constexpr uint_least32_t hex_to_dec(const T codepoint) noexcept
 	{
-		if constexpr (std::is_same_v<remove_cvref_t<T>, uint_least32_t>)
+		if constexpr (std::is_same_v<remove_cvref<T>, uint_least32_t>)
 			return codepoint >= 0x41u					 // >= 'A'
 					 ? 10u + (codepoint | 0x20u) - 0x61u // - 'a'
 					 : codepoint - 0x30u				 // - '0'
@@ -6789,7 +6800,7 @@ TOML_IMPL_NAMESPACE_START
 		return codepoint >= 0xD800u && codepoint <= 0xDFFF;
 	}
 
-	struct utf8_decoder final
+	struct utf8_decoder
 	{
 		// utf8_decoder based on this: https://bjoern.hoehrmann.de/utf-8/decoder/dfa/
 		// Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
@@ -7255,29 +7266,29 @@ TOML_NAMESPACE_START
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::string_view doc, std::string_view source_path = {}) TOML_MAY_THROW;
+	parse_result parse(std::string_view doc, std::string_view source_path = {});
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::string_view doc, std::string && source_path) TOML_MAY_THROW;
+	parse_result parse(std::string_view doc, std::string && source_path);
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse_file(std::string_view file_path) TOML_MAY_THROW;
+	parse_result parse_file(std::string_view file_path);
 
 #if TOML_HAS_CHAR8
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::u8string_view doc, std::string_view source_path = {}) TOML_MAY_THROW;
+	parse_result parse(std::u8string_view doc, std::string_view source_path = {});
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::u8string_view doc, std::string && source_path) TOML_MAY_THROW;
+	parse_result parse(std::u8string_view doc, std::string && source_path);
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse_file(std::u8string_view file_path) TOML_MAY_THROW;
+	parse_result parse_file(std::u8string_view file_path);
 
 #endif // TOML_HAS_CHAR8
 
@@ -7285,15 +7296,15 @@ TOML_NAMESPACE_START
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::string_view doc, std::wstring_view source_path) TOML_MAY_THROW;
+	parse_result parse(std::string_view doc, std::wstring_view source_path);
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::istream & doc, std::wstring_view source_path) TOML_MAY_THROW;
+	parse_result parse(std::istream & doc, std::wstring_view source_path);
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse_file(std::wstring_view file_path) TOML_MAY_THROW;
+	parse_result parse_file(std::wstring_view file_path);
 
 #endif // TOML_WINDOWS_COMPAT
 
@@ -7301,17 +7312,17 @@ TOML_NAMESPACE_START
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::u8string_view doc, std::wstring_view source_path) TOML_MAY_THROW;
+	parse_result parse(std::u8string_view doc, std::wstring_view source_path);
 
 #endif // TOML_HAS_CHAR8 && TOML_WINDOWS_COMPAT
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::istream & doc, std::string_view source_path = {}) TOML_MAY_THROW;
+	parse_result parse(std::istream & doc, std::string_view source_path = {});
 
 	TOML_NODISCARD
 	TOML_API
-	parse_result parse(std::istream & doc, std::string && source_path) TOML_MAY_THROW;
+	parse_result parse(std::istream & doc, std::string && source_path);
 
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
@@ -7320,7 +7331,7 @@ TOML_NAMESPACE_START
 		TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, lit_ex, lit_noex);
 
 		TOML_NODISCARD
-		inline parse_result operator"" _toml(const char* str, size_t len) TOML_MAY_THROW
+		inline parse_result operator"" _toml(const char* str, size_t len)
 		{
 			return parse(std::string_view{ str, len });
 		}
@@ -7328,7 +7339,7 @@ TOML_NAMESPACE_START
 #if TOML_HAS_CHAR8
 
 		TOML_NODISCARD
-		inline parse_result operator"" _toml(const char8_t* str, size_t len) TOML_MAY_THROW
+		inline parse_result operator"" _toml(const char8_t* str, size_t len)
 		{
 			return parse(std::u8string_view{ str, len });
 		}
@@ -7686,7 +7697,7 @@ extern "C" __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int
 TOML_IMPL_NAMESPACE_START
 {
 	TOML_EXTERNAL_LINKAGE
-	std::string narrow(std::wstring_view str) noexcept
+	std::string narrow(std::wstring_view str)
 	{
 		if (str.empty())
 			return {};
@@ -7710,7 +7721,7 @@ TOML_IMPL_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	std::wstring widen(std::string_view str) noexcept
+	std::wstring widen(std::string_view str)
 	{
 		if (str.empty())
 			return {};
@@ -7728,7 +7739,7 @@ TOML_IMPL_NAMESPACE_START
 #if TOML_HAS_CHAR8
 
 	TOML_EXTERNAL_LINKAGE
-	std::wstring widen(std::u8string_view str) noexcept
+	std::wstring widen(std::u8string_view str)
 	{
 		if (str.empty())
 			return {};
@@ -8253,8 +8264,9 @@ TOML_NAMESPACE_START
 	template class node_view<const node>;
 
 #define TOML_EXTERN(name, T)                                                                                           \
-	template optional<T> node_view<node>::name<T>() const noexcept;                                                    \
-	template optional<T> node_view<const node>::name<T>() const noexcept
+	template optional<T> node_view<node>::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>);   \
+	template optional<T> node_view<const node>::name<T>()                                                              \
+		const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>)
 
 	TOML_EXTERN(value_exact, std::string_view);
 	TOML_EXTERN(value_exact, std::string);
@@ -8325,7 +8337,8 @@ TOML_NAMESPACE_START
 	template class value<time>;
 	template class value<date_time>;
 
-#define TOML_EXTERN(name, T) template optional<T> node::name<T>() const noexcept
+#define TOML_EXTERN(name, T)                                                                                           \
+	template optional<T> node::name<T>() const TOML_EXTERN_NOEXCEPT(impl::value_retrieval_is_nothrow<T>)
 
 	TOML_EXTERN(value_exact, std::string_view);
 	TOML_EXTERN(value_exact, std::string);
@@ -8413,7 +8426,7 @@ TOML_ANON_NAMESPACE_END;
 TOML_NAMESPACE_START
 {
 	TOML_EXTERNAL_LINKAGE
-	array::array(const array& other) noexcept //
+	array::array(const array& other) //
 		: node(other)
 	{
 		elements.reserve(other.elements.size());
@@ -8436,7 +8449,7 @@ TOML_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	array& array::operator=(const array& rhs) noexcept
+	array& array::operator=(const array& rhs)
 	{
 		if (&rhs != this)
 		{
@@ -8461,7 +8474,7 @@ TOML_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	void array::preinsertion_resize(size_t idx, size_t count) noexcept
+	void array::preinsertion_resize(size_t idx, size_t count)
 	{
 		TOML_ASSERT(idx <= elements.size());
 		TOML_ASSERT(count >= 1u);
@@ -8646,7 +8659,23 @@ TOML_ANON_NAMESPACE_END;
 TOML_NAMESPACE_START
 {
 	TOML_EXTERNAL_LINKAGE
-	table::table(const table& other) noexcept //
+	table::table(const impl::table_init_pair* b, const impl::table_init_pair* e)
+	{
+		for (; b != e; b++)
+		{
+			if (!b->value) // empty node_views
+				continue;
+
+			map_.insert_or_assign(std::move(b->key), std::move(b->value));
+		}
+
+#if TOML_LIFETIME_HOOKS
+		TOML_TABLE_CREATED;
+#endif
+	}
+
+	TOML_EXTERNAL_LINKAGE
+	table::table(const table& other) //
 		: node(other),
 		  inline_{ other.inline_ }
 	{
@@ -8670,7 +8699,7 @@ TOML_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	table& table::operator=(const table& rhs) noexcept
+	table& table::operator=(const table& rhs)
 	{
 		if (&rhs != this)
 		{
@@ -8695,17 +8724,6 @@ TOML_NAMESPACE_START
 		return *this;
 	}
 
-	TOML_EXTERNAL_LINKAGE
-	table::table(impl::table_init_pair * pairs, size_t count) noexcept
-	{
-		for (size_t i = 0; i < count; i++)
-		{
-			if (!pairs[i].value) // empty node_views
-				continue;
-			map_.insert_or_assign(std::move(pairs[i].key), std::move(pairs[i].value));
-		}
-	}
-
 	TOML_EXTERNAL_LINKAGE
 	bool table::is_homogeneous(node_type ntype) const noexcept
 	{
@@ -8920,7 +8938,7 @@ TOML_ANON_NAMESPACE_START
 		}
 	};
 
-	struct utf8_codepoint final
+	struct utf8_codepoint
 	{
 		char32_t value;
 		char bytes[4];
@@ -9350,14 +9368,14 @@ TOML_ANON_NAMESPACE_START
 	TOML_NEVER_INLINE
 	void concatenate(char*& write_pos, char* const buf_end, const T& arg) noexcept
 	{
-		static_assert(impl::is_one_of<impl::remove_cvref_t<T>, std::string_view, int64_t, uint64_t, double>,
+		static_assert(impl::is_one_of<impl::remove_cvref<T>, std::string_view, int64_t, uint64_t, double>,
 					  "concatenate inputs are limited to std::string_view, int64_t, uint64_t and double to keep "
 					  "instantiations to a minimum as an anti-bloat measure (hint: to_sv will probably help)");
 
 		if (write_pos >= buf_end)
 			return;
 
-		using arg_t = impl::remove_cvref_t<T>;
+		using arg_t = impl::remove_cvref<T>;
 		if constexpr (std::is_same_v<arg_t, std::string_view>)
 		{
 			const auto max_chars = static_cast<size_t>(buf_end - write_pos);
@@ -9415,7 +9433,7 @@ TOML_ANON_NAMESPACE_START
 		}
 
 		TOML_RETURNS_BY_THROWING
-		auto finish(const source_position& pos, const source_path_ptr& source_path) const TOML_MAY_THROW
+		auto finish(const source_position& pos, const source_path_ptr& source_path) const
 		{
 			*write_pos = '\0';
 
@@ -9711,7 +9729,7 @@ TOML_IMPL_NAMESPACE_START
 		template <typename... T>
 		TOML_RETURNS_BY_THROWING
 		TOML_NEVER_INLINE
-		void set_error_at(source_position pos, const T&... reason) const TOML_MAY_THROW
+		void set_error_at(source_position pos, const T&... reason) const
 		{
 			static_assert(sizeof...(T) > 0);
 #if !TOML_EXCEPTIONS
@@ -9733,7 +9751,7 @@ TOML_IMPL_NAMESPACE_START
 
 		template <typename... T>
 		TOML_RETURNS_BY_THROWING
-		void set_error(const T&... reason) const TOML_MAY_THROW
+		void set_error(const T&... reason) const
 		{
 			set_error_at(current_position(1), reason...);
 		}
@@ -9747,7 +9765,7 @@ TOML_IMPL_NAMESPACE_START
 			prev_pos = cp->position;
 		}
 
-		void advance() TOML_MAY_THROW
+		void advance()
 		{
 			return_if_error();
 			assert_not_eof();
@@ -9799,7 +9817,7 @@ TOML_IMPL_NAMESPACE_START
 			}
 		}
 
-		bool consume_leading_whitespace() TOML_MAY_THROW
+		bool consume_leading_whitespace()
 		{
 			return_if_error_or_eof({});
 
@@ -9812,7 +9830,7 @@ TOML_IMPL_NAMESPACE_START
 			return consumed;
 		}
 
-		bool consume_line_break() TOML_MAY_THROW
+		bool consume_line_break()
 		{
 			return_if_error_or_eof({});
 
@@ -9832,7 +9850,7 @@ TOML_IMPL_NAMESPACE_START
 			return true;
 		}
 
-		bool consume_rest_of_line() TOML_MAY_THROW
+		bool consume_rest_of_line()
 		{
 			return_if_error_or_eof({});
 
@@ -9849,7 +9867,7 @@ TOML_IMPL_NAMESPACE_START
 			return true;
 		}
 
-		bool consume_comment() TOML_MAY_THROW
+		bool consume_comment()
 		{
 			return_if_error_or_eof({});
 
@@ -9885,7 +9903,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		bool consume_expected_sequence(std::u32string_view seq) TOML_MAY_THROW
+		bool consume_expected_sequence(std::u32string_view seq)
 		{
 			return_if_error({});
 			TOML_ASSERT(!seq.empty());
@@ -9902,7 +9920,7 @@ TOML_IMPL_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		bool consume_digit_sequence(T* digits, size_t len) TOML_MAY_THROW
+		bool consume_digit_sequence(T* digits, size_t len)
 		{
 			return_if_error({});
 			assert_or_assume(digits);
@@ -9922,7 +9940,7 @@ TOML_IMPL_NAMESPACE_START
 
 		template <typename T>
 		TOML_NODISCARD
-		size_t consume_variable_length_digit_sequence(T* buffer, size_t max_len) TOML_MAY_THROW
+		size_t consume_variable_length_digit_sequence(T* buffer, size_t max_len)
 		{
 			return_if_error({});
 			assert_or_assume(buffer);
@@ -9942,7 +9960,7 @@ TOML_IMPL_NAMESPACE_START
 
 		// template <bool MultiLine>
 		TOML_NODISCARD
-		std::string parse_basic_string(bool multi_line) TOML_MAY_THROW
+		std::string parse_basic_string(bool multi_line)
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10169,7 +10187,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		std::string parse_literal_string(bool multi_line) TOML_MAY_THROW
+		std::string parse_literal_string(bool multi_line)
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10272,7 +10290,7 @@ TOML_IMPL_NAMESPACE_START
 
 		TOML_NODISCARD
 		TOML_NEVER_INLINE
-		parsed_string parse_string() TOML_MAY_THROW
+		parsed_string parse_string()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10315,7 +10333,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		std::string parse_bare_key_segment() TOML_MAY_THROW
+		std::string parse_bare_key_segment()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10336,7 +10354,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		bool parse_boolean() TOML_MAY_THROW
+		bool parse_boolean()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10360,7 +10378,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		double parse_inf_or_nan() TOML_MAY_THROW
+		double parse_inf_or_nan()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10389,7 +10407,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		double parse_float() TOML_MAY_THROW
+		double parse_float()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10544,7 +10562,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		double parse_hex_float() TOML_MAY_THROW
+		double parse_hex_float()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10720,7 +10738,7 @@ TOML_IMPL_NAMESPACE_START
 
 		template <uint64_t base>
 		TOML_NODISCARD
-		int64_t parse_integer() TOML_MAY_THROW
+		int64_t parse_integer()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10839,7 +10857,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		date parse_date(bool part_of_datetime = false) TOML_MAY_THROW
+		date parse_date(bool part_of_datetime = false)
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10893,7 +10911,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		time parse_time(bool part_of_datetime = false) TOML_MAY_THROW
+		time parse_time(bool part_of_datetime = false)
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -10987,7 +11005,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		date_time parse_date_time() TOML_MAY_THROW
+		date_time parse_date_time()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -11057,13 +11075,13 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		array* parse_array() TOML_MAY_THROW;
+		array* parse_array();
 
 		TOML_NODISCARD
-		table* parse_inline_table() TOML_MAY_THROW;
+		table* parse_inline_table();
 
 		TOML_NODISCARD
-		node* parse_value_known_prefixes() TOML_MAY_THROW
+		node* parse_value_known_prefixes()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -11105,7 +11123,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		node* parse_value() TOML_MAY_THROW
+		node* parse_value()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -11191,7 +11209,7 @@ TOML_IMPL_NAMESPACE_START
 				char32_t chars[utf8_buffered_reader::max_history_length];
 				size_t char_count = {}, advance_count = {};
 				bool eof_while_scanning = false;
-				const auto scan			= [&]() TOML_MAY_THROW
+				const auto scan			= [&]()
 				{
 					if (is_eof())
 						return;
@@ -11579,7 +11597,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		parsed_key parse_key() TOML_MAY_THROW
+		parsed_key parse_key()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -11648,7 +11666,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		parsed_key_value_pair parse_key_value_pair() TOML_MAY_THROW
+		parsed_key_value_pair parse_key_value_pair()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -11681,7 +11699,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 		TOML_NODISCARD
-		table* parse_table_header() TOML_MAY_THROW
+		table* parse_table_header()
 		{
 			return_if_error({});
 			assert_not_eof();
@@ -11872,7 +11890,7 @@ TOML_IMPL_NAMESPACE_START
 			}
 		}
 
-		void parse_key_value_pair_and_insert(table* tab) TOML_MAY_THROW
+		void parse_key_value_pair_and_insert(table* tab)
 		{
 			return_if_error();
 			assert_not_eof();
@@ -11936,7 +11954,7 @@ TOML_IMPL_NAMESPACE_START
 			tab->map_.emplace(std::move(kvp.key.segments.back()), std::unique_ptr<node>{ kvp.value.release() });
 		}
 
-		void parse_document() TOML_MAY_THROW
+		void parse_document()
 		{
 			assert_not_error();
 			assert_not_eof();
@@ -12022,7 +12040,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 
 	  public:
-		parser(utf8_reader_interface&& reader_) TOML_MAY_THROW : reader{ reader_ }
+		parser(utf8_reader_interface&& reader_) : reader{ reader_ }
 		{
 			root.source_ = { prev_pos, prev_pos, reader.source_path() };
 
@@ -12064,7 +12082,7 @@ TOML_IMPL_NAMESPACE_START
 	};
 
 	TOML_EXTERNAL_LINKAGE
-	array* parser::parse_array() TOML_MAY_THROW
+	array* parser::parse_array()
 	{
 		return_if_error({});
 		assert_not_eof();
@@ -12127,7 +12145,7 @@ TOML_IMPL_NAMESPACE_START
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	table* parser::parse_inline_table() TOML_MAY_THROW
+	table* parser::parse_inline_table()
 	{
 		return_if_error({});
 		assert_not_eof();
@@ -12237,14 +12255,14 @@ TOML_ANON_NAMESPACE_START
 {
 	TOML_NODISCARD
 	TOML_INTERNAL_LINKAGE
-	parse_result do_parse(utf8_reader_interface && reader) TOML_MAY_THROW
+	parse_result do_parse(utf8_reader_interface && reader)
 	{
 		return impl::parser{ std::move(reader) };
 	}
 
 	TOML_NODISCARD
 	TOML_INTERNAL_LINKAGE
-	parse_result do_parse_file(std::string_view file_path) TOML_MAY_THROW
+	parse_result do_parse_file(std::string_view file_path)
 	{
 #if TOML_EXCEPTIONS
 #define TOML_PARSE_FILE_ERROR(msg, path)                                                                               \
@@ -12303,31 +12321,31 @@ TOML_NAMESPACE_START
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex);
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::string_view doc, std::string_view source_path) TOML_MAY_THROW
+	parse_result parse(std::string_view doc, std::string_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, source_path });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::string_view doc, std::string && source_path) TOML_MAY_THROW
+	parse_result parse(std::string_view doc, std::string && source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, std::move(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::istream & doc, std::string_view source_path) TOML_MAY_THROW
+	parse_result parse(std::istream & doc, std::string_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, source_path });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::istream & doc, std::string && source_path) TOML_MAY_THROW
+	parse_result parse(std::istream & doc, std::string && source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, std::move(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse_file(std::string_view file_path) TOML_MAY_THROW
+	parse_result parse_file(std::string_view file_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse_file(file_path);
 	}
@@ -12335,19 +12353,19 @@ TOML_NAMESPACE_START
 #if TOML_HAS_CHAR8
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::u8string_view doc, std::string_view source_path) TOML_MAY_THROW
+	parse_result parse(std::u8string_view doc, std::string_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, source_path });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::u8string_view doc, std::string && source_path) TOML_MAY_THROW
+	parse_result parse(std::u8string_view doc, std::string && source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, std::move(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse_file(std::u8string_view file_path) TOML_MAY_THROW
+	parse_result parse_file(std::u8string_view file_path)
 	{
 		std::string file_path_str;
 		file_path_str.resize(file_path.length());
@@ -12360,19 +12378,19 @@ TOML_NAMESPACE_START
 #if TOML_WINDOWS_COMPAT
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::string_view doc, std::wstring_view source_path) TOML_MAY_THROW
+	parse_result parse(std::string_view doc, std::wstring_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, impl::narrow(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::istream & doc, std::wstring_view source_path) TOML_MAY_THROW
+	parse_result parse(std::istream & doc, std::wstring_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, impl::narrow(source_path) });
 	}
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse_file(std::wstring_view file_path) TOML_MAY_THROW
+	parse_result parse_file(std::wstring_view file_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse_file(impl::narrow(file_path));
 	}
@@ -12382,7 +12400,7 @@ TOML_NAMESPACE_START
 #if TOML_HAS_CHAR8 && TOML_WINDOWS_COMPAT
 
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::u8string_view doc, std::wstring_view source_path) TOML_MAY_THROW
+	parse_result parse(std::u8string_view doc, std::wstring_view source_path)
 	{
 		return TOML_ANON_NAMESPACE::do_parse(TOML_ANON_NAMESPACE::utf8_reader{ doc, impl::narrow(source_path) });
 	}
@@ -13188,6 +13206,7 @@ TOML_POP_WARNINGS;
 #undef TOML_EVAL_BOOL_0
 #undef TOML_EVAL_BOOL_1
 #undef TOML_EXTERNAL_LINKAGE
+#undef TOML_EXTERN_NOEXCEPT
 #undef TOML_EXTERN_TEMPLATES
 #undef TOML_FLOAT_CHARCONV
 #undef TOML_FLOAT128
@@ -13218,7 +13237,6 @@ TOML_POP_WARNINGS;
 #undef TOML_MAKE_FLAGS
 #undef TOML_MAKE_FLAGS_
 #undef TOML_MAKE_VERSION
-#undef TOML_MAY_THROW
 #undef TOML_MSVC
 #undef TOML_NAMESPACE
 #undef TOML_NAMESPACE_END
diff --git a/tools/generate_conformance_tests.py b/tools/generate_conformance_tests.py
index 528e3ff8..1c57e7a6 100644
--- a/tools/generate_conformance_tests.py
+++ b/tools/generate_conformance_tests.py
@@ -132,7 +132,7 @@ def render(self, indent = '', indent_declaration = False):
 		if len(self.values) == 0:
 			s += 'toml::table{}'
 		else:
-			s += 'toml::table{{'
+			s += 'toml::table{'
 			for key, val in self.values.items():
 				s += '\n' + indent + '\t{ '
 				if isinstance(val, (TomlPPTable, TomlPPArray)) and len(val) > 0:
@@ -142,7 +142,7 @@ def render(self, indent = '', indent_declaration = False):
 				else:
 					s += '{}, {} '.format(python_value_to_tomlpp(str(key)), python_value_to_tomlpp(val))
 				s += '},'
-			s += '\n' + indent + '}}'
+			s += '\n' + indent + '}'
 		return s
 
 	def __str__(self):
diff --git a/tools/generate_single_header.py b/tools/generate_single_header.py
index c777462a..91ed0161 100644
--- a/tools/generate_single_header.py
+++ b/tools/generate_single_header.py
@@ -94,6 +94,12 @@ def main():
 		toml_h = re.sub(rf'{comment_line}+', '\n', toml_h)
 		# trailing whitespace
 		toml_h = re.sub('([^ \t])[ \t]+\n', r'\1\n', toml_h)
+		# enable warnings -> disable warnings
+		toml_h = re.sub('(TOML_ENABLE_WARNINGS;)\n[ \t\n]*\n(TOML_DISABLE_WARNINGS;)', r'', toml_h)
+		# blank lines between consecutive TOML_DISABLE_XXXXX_WARNINGS statements
+		toml_h = re.sub('(TOML_(?:PUSH|DISABLE_[A-Z_]+?)WARNINGS;)\n[ \t\n]*\n(TOML_DISABLE_[A-Z_]+?WARNINGS;)', r'\1\n\2', toml_h)
+		# blank lines between consecutive #includes
+		toml_h = re.sub('[#]\s*include\s*<(.+?)>\n[ \t\n]*\n[#]\s*include\s*<(.+?)>', r'#include <\1>\n#include <\2>', toml_h)
 		# double blank lines
 		toml_h = re.sub('\n(?:[ \t]*\n[ \t]*)+\n', '\n\n', toml_h)
 		# weird spacing edge case between } and pp directives
@@ -102,8 +108,6 @@ def main():
 		toml_h = re.sub(r'([^@][({,])\n\n', r'\1\n', toml_h)
 		# blank lines preceeding closing brackets
 		toml_h = re.sub(r'\n\n([ \t]*[})])', r'\n\1', toml_h)
-		# blank lines between consecutive TOML_DISABLE_XXXXX_WARNINGS statements
-		toml_h = re.sub('(TOML_(?:PUSH|DISABLE_[A-Z_]+?)WARNINGS;)\n[ \t\n]*\n(TOML_DISABLE_[A-Z_]+?WARNINGS;)', r'\1\n\2', toml_h)
 		# ensure only one trailing newline
 		toml_h = toml_h.strip() + '\n'