Index: libcfa/prelude/prelude-gen.cc
===================================================================
--- libcfa/prelude/prelude-gen.cc	(revision ae0c1c3bd041ed739c4bdaa8dd6b3cd33d35f692)
+++ libcfa/prelude/prelude-gen.cc	(revision edd11bd4c96be8bf580797f2fc7afa5230c1b6f1)
@@ -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)...}};
 }