diff --git a/source/containers.tex b/source/containers.tex
index 26cae02912..1018be063d 100644
--- a/source/containers.tex
+++ b/source/containers.tex
@@ -333,8 +333,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator};
-\tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -353,8 +353,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator};
-\tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -773,8 +773,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reverse_iterator};
-\tcode{const_reverse_iterator} for constant \tcode{a}.
+\tcode{const_reverse_iterator} if \tcode{a} is of type \tcode{const X};
+\tcode{reverse_iterator} otherwise.
 
 \pnum
 \returns
@@ -793,8 +793,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reverse_iterator};
-\tcode{const_reverse_iterator} for constant \tcode{a}.
+\tcode{const_reverse_iterator} if \tcode{a} is of type \tcode{const X};
+\tcode{reverse_iterator} otherwise.
 
 \pnum
 \returns
@@ -1845,7 +1845,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reference; const_reference} for constant \tcode{a}.
+\tcode{const_reference} if \tcode{a} is of type \tcode{const X};
+\tcode{reference} otherwise.
 
 \pnum
 \returns
@@ -1869,7 +1870,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reference; const_reference} for constant \tcode{a}.
+\tcode{const_reference} if \tcode{a} is of type \tcode{const X};
+\tcode{reference} otherwise.
 
 \pnum
 \effects
@@ -2178,7 +2180,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reference; const_reference} for constant \tcode{a}
+\tcode{const_reference} if \tcode{a} is of type \tcode{const X};
+\tcode{reference} otherwise.
 
 \pnum
 \effects
@@ -2200,7 +2203,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reference; const_reference} for constant \tcode{a}
+\tcode{const_reference} if \tcode{a} is of type \tcode{const X};
+\tcode{reference} otherwise.
 
 \pnum
 \returns
@@ -3685,7 +3689,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3705,7 +3710,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{a_tran}.
+\tcode{const_iterator} if \tcode{a_tran} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3795,7 +3801,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3815,7 +3822,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{a_tran}.
+\tcode{const_iterator} if \tcode{a_tran} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3836,7 +3844,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3856,7 +3865,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{a_tran}.
+\tcode{const_iterator} if \tcode{a_tran} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3877,8 +3887,9 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{pair<iterator, iterator>};
-\tcode{pair<const_iterator, const_iterator>} for constant \tcode{b}.
+\tcode{pair<const_iterator, const_iterator>}
+if \tcode{b} is of type \tcode{const X}; \\
+\tcode{pair<iterator, iterator>} otherwise.
 
 \pnum
 \effects
@@ -3897,8 +3908,9 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{pair<iterator, iterator>};
-\tcode{pair<const_iterator, const_iterator>} for constant \tcode{a_tran}.
+\tcode{pair<const_iterator, const_iterator>}
+if \tcode{a_tran} is of type \tcode{const X}; \\
+\tcode{pair<iterator, iterator>} otherwise.
 
 \pnum
 \effects
@@ -5382,7 +5394,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -5402,7 +5415,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{a_tran}.
+\tcode{const_iterator} if \tcode{a_tran} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -5483,8 +5497,9 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{pair<iterator, iterator>};
-\tcode{pair<const_iterator, const_iterator>} for constant \tcode{b}.
+\tcode{pair<const_iterator, const_iterator>}
+if \tcode{b} is of type \tcode{const X}; \\
+\tcode{pair<iterator, iterator>} otherwise.
 
 \pnum
 \returns
@@ -5504,8 +5519,9 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{pair<iterator, iterator>};
-\tcode{pair<const_iterator, const_iterator>} for constant \tcode{a_tran}.
+\tcode{pair<const_iterator, const_iterator>}
+if \tcode{a_tran} is of type \tcode{const X}; \\
+\tcode{pair<iterator, iterator>} otherwise.
 
 \pnum
 \returns
@@ -5642,7 +5658,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{local_iterator}; \tcode{const_local_iterator} for constant \tcode{b}.
+\tcode{const_local_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{local_iterator} otherwise.
 
 \pnum
 \expects
@@ -5666,7 +5683,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{local_iterator}; \tcode{const_local_iterator} for constant \tcode{b}.
+\tcode{const_local_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{local_iterator} otherwise.
 
 \pnum
 \expects