Index: source/simulation2/serialization/SerializeTemplates.h
===================================================================
--- source/simulation2/serialization/SerializeTemplates.h
+++ source/simulation2/serialization/SerializeTemplates.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -48,7 +48,7 @@
 		{
 			T el;
 			ELEM()(deserialize, name, el);
-			value.push_back(el);
+			value.emplace_back(std::move(el));
 		}
 	}
 };
@@ -100,6 +100,33 @@
 	}
 };
 
+template<typename ELEM>
+struct SerializeSet
+{
+	template<typename T>
+	void operator()(ISerializer& serialize, const char* name, const std::set<T>& value)
+	{
+		size_t size = value.size();
+		serialize.NumberU32_Unbounded("size", static_cast<u32>(size));
+		for (const T& elem : value)
+			ELEM()(serialize, name, elem);
+	}
+
+	template<typename T>
+	void operator()(IDeserializer& deserialize, const char* name, std::set<T>& value)
+	{
+		value.clear();
+		u32 size;
+		deserialize.NumberU32_Unbounded("size", size);
+		for (size_t i = 0; i < size; ++i)
+		{
+			T el;
+			ELEM()(deserialize, name, el);
+			value.emplace(std::move(el));
+		}
+	}
+};
+
 template<typename KS, typename VS>
 struct SerializeMap
 {
@@ -141,7 +168,7 @@
 			V v;
 			KS()(deserialize, "key", k);
 			VS()(deserialize, "value", v);
-			value.insert(std::make_pair(k, v));
+			value.emplace(std::move(k), std::move(v));
 		}
 	}
 
@@ -159,7 +186,7 @@
 			V v;
 			KS()(deserialize, "key", k);
 			VS()(deserialize, "value", v, context);
-			value.insert(std::make_pair(k, v));
+			value.emplace(std::move(k), std::move(v));
 		}
 	}
 };
@@ -194,7 +221,7 @@
 	{
 		u8 val;
 		deserialize.NumberU8(name, val, 0, max);
-		value = (T)val;
+		value = static_cast<T>(val);
 	}
 };
 
Index: source/simulation2/tests/test_SerializeTemplates.h
===================================================================
--- source/simulation2/tests/test_SerializeTemplates.h
+++ source/simulation2/tests/test_SerializeTemplates.h
@@ -0,0 +1,65 @@
+/* Copyright (C) 2019 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 0 A.D. is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "lib/self_test.h"
+
+#include "ps/Filesystem.h"
+#include "ps/Loader.h"
+#include "ps/XML/Xeromyces.h"
+#include "simulation2/serialization/DebugSerializer.h"
+#include "simulation2/serialization/HashSerializer.h"
+#include "simulation2/serialization/SerializeTemplates.h"
+#include "simulation2/serialization/StdSerializer.h"
+#include "simulation2/serialization/StdDeserializer.h"
+#include "simulation2/Simulation2.h"
+#include "scriptinterface/ScriptInterface.h"
+
+#include <set>
+#include <sstream>
+#include <vector>
+
+#include <iostream>
+
+class TestSerializeTemplates : public CxxTest::TestSuite
+{
+public:
+  void test_Debug_vector()
+  {
+    ScriptInterface script("Test", "Test", g_ScriptRuntime);
+    std::stringstream stream;
+
+    CDebugSerializer serialize(script, stream);
+    std::vector<u32> value = {
+      3, 0, 1, 4, 1, 5
+    };
+    SerializeVector<SerializeU32_Unbounded>()(serialize, "E", value);
+    TS_ASSERT_STR_EQUALS(stream.str(), "length: 6\nE: 3\nE: 0\nE: 1\nE: 4\nE: 1\nE: 5\n");
+  }
+
+  void test_Debug_set()
+  {
+    ScriptInterface script("Test", "Test", g_ScriptRuntime);
+    std::stringstream stream;
+
+    CDebugSerializer serialize(script, stream);
+    std::set<u32> value = {
+      3, 0, 1, 4, 1, 5
+    };
+    SerializeSet<SerializeU32_Unbounded>()(serialize, "E", value);
+    TS_ASSERT_STR_EQUALS(stream.str(), "size: 5\nE: 0\nE: 1\nE: 3\nE: 4\nE: 5\n");
+  }
+};