Index: libcfa/prelude/prelude-gen.cc
===================================================================
--- libcfa/prelude/prelude-gen.cc	(revision 88771d7ade4425a7d78fc1f20e4268844149d953)
+++ libcfa/prelude/prelude-gen.cc	(revision c9c1a7e692ac90923e77cd157da657286b6f54f4)
@@ -149,14 +149,10 @@
 }
 
-template <typename... T>
-constexpr auto make_array(T&&... values) ->
-    std::array<
-        typename std::decay<typename std::common_type<T...>::type>::type,
-        sizeof...(T)>
-{
-    return std::array<
-        typename std::decay<
-            typename std::common_type<T...>::type>::type,
-        sizeof...(T)>{{std::forward<T>(values)...}};
+template<typename... T>
+using make_array_t = std::array<std::decay_t<std::common_type_t<T...>>, sizeof...(T)>;
+
+template<typename... T>
+constexpr make_array_t<T...> make_array(T&&... values) {
+	return make_array_t<T...>{{std::forward<T>(values)...}};
 }