diff --git a/source/containers.tex b/source/containers.tex
index bfceedb1e9..d54c1f084e 100644
--- a/source/containers.tex
+++ b/source/containers.tex
@@ -3574,16 +3574,16 @@
 
 \indexlibrary{\idxcode{tuple_element}}%
 \begin{itemdecl}
-tuple_element<I, array<T, N>>::type
+template<size_t I, class T, size_t N>
+  struct tuple_element<I, array<T, N>> {
+    using type = T;
+  };
 \end{itemdecl}
 
 \begin{itemdescr}
 \pnum
 \mandates
 \tcode{I < N} is \tcode{true}.
-
-\pnum
-\cvalue The type \tcode{T}.
 \end{itemdescr}
 
 \indexlibrarymember{array}{get}%
@@ -11102,17 +11102,16 @@
 
 \indexlibrary{\idxcode{tuple_element}}%
 \begin{itemdecl}
-tuple_element<I, span<ElementType, Extent>>::type
+template<size_t I, class ElementType, size_t Extent>
+  struct tuple_element<I, span<ElementType, Extent>> {
+    using type = ElementType;
+  };
 \end{itemdecl}
 
 \begin{itemdescr}
 \pnum
 \mandates
 \tcode{Extent != dynamic_extent \&\& I < Extent} is \tcode{true}.
-
-\pnum
-\cvalue
-The type \tcode{ElementType}.
 \end{itemdescr}
 
 \indexlibrary{\idxcode{get}}%
diff --git a/source/utilities.tex b/source/utilities.tex
index e3c7ec6701..7bbe998bb2 100644
--- a/source/utilities.tex
+++ b/source/utilities.tex
@@ -886,14 +886,17 @@
 
 \indexlibrary{\idxcode{tuple_element}}%
 \begin{itemdecl}
-tuple_element<I, pair<T1, T2>>::type
+template<size_t I, class T1, class T2>
+  struct tuple_element<I, pair<T1, T2>> {
+    using type = @\seebelow@ ;
+  };
 \end{itemdecl}
 \begin{itemdescr}
 \pnum
 \requires \tcode{I < 2}. The program is ill-formed if \tcode{I} is out of bounds.
 
 \pnum
-\textit{Value:} The type \tcode{T1} if \tcode{I == 0}, otherwise the type \tcode{T2}.
+\ctype The type \tcode{T1} if \tcode{I == 0}, otherwise the type \tcode{T2}.
 \end{itemdescr}
 
 \indexlibrarymember{get}{pair}%