diff --git a/src/array_view.hh b/src/array_view.hh
index e9c455ff..7ee32d12 100644
--- a/src/array_view.hh
+++ b/src/array_view.hh
@@ -32,7 +32,7 @@ public:
     constexpr ArrayView(T(&array)[N]) : m_pointer(array), m_size(N) {}
 
     template<typename Alloc, typename U,
-             typename = typename std::enable_if<sizeof(U) == sizeof(T)>::type>
+             typename = std::enable_if_t<sizeof(U) == sizeof(T)>>
     constexpr ArrayView(const std::vector<U, Alloc>& v)
         : m_pointer(v.data()), m_size(v.size()) {}
 
diff --git a/src/commands.cc b/src/commands.cc
index ce54da90..e9bcfb9c 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -68,8 +68,8 @@ template<typename Completer, typename... Rest>
 struct PerArgumentCommandCompleter<Completer, Rest...> : PerArgumentCommandCompleter<Rest...>
 {
     template<typename C, typename... R,
-             typename = typename std::enable_if<not std::is_base_of<PerArgumentCommandCompleter<>,
-                                                std::remove_reference_t<C>>::value>::type>
+             typename = std::enable_if_t<not std::is_base_of<PerArgumentCommandCompleter<>,
+                                         std::remove_reference_t<C>>::value>>
     PerArgumentCommandCompleter(C&& completer, R&&... rest)
       : PerArgumentCommandCompleter<Rest...>(std::forward<R>(rest)...),
         m_completer(std::forward<C>(completer)) {}