diff --git a/source/containers.tex b/source/containers.tex
index 6a71104dd1..88566dd427 100644
--- a/source/containers.tex
+++ b/source/containers.tex
@@ -339,8 +339,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
@@ -359,8 +359,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
@@ -822,8 +822,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
@@ -842,8 +842,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
@@ -1919,7 +1919,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
 \hardexpects
@@ -1948,7 +1949,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
 \hardexpects
@@ -2267,7 +2269,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
 \hardexpects
@@ -2294,7 +2297,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
@@ -3783,7 +3787,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
@@ -3803,7 +3808,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
@@ -3893,7 +3899,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
@@ -3913,7 +3920,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
@@ -3934,7 +3942,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
@@ -3954,7 +3963,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
@@ -3975,8 +3985,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<iter\-ator, iter\-ator>} otherwise.
 
 \pnum
 \effects
@@ -3995,8 +4006,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<iter\-ator, iter\-ator>} otherwise.
 
 \pnum
 \effects
@@ -5470,7 +5482,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
@@ -5490,7 +5503,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
@@ -5571,8 +5585,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<iter\-ator, iter\-ator>} otherwise.
 
 \pnum
 \returns
@@ -5592,8 +5607,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<iter\-ator, iter\-ator>} otherwise.
 
 \pnum
 \returns
@@ -5730,7 +5746,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
@@ -5754,7 +5771,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