diff --git a/source/containers.tex b/source/containers.tex
index 6d59df9e88..61ca991784 100644
--- a/source/containers.tex
+++ b/source/containers.tex
@@ -16957,19 +16957,24 @@
     // \ref{flat.set.cons}, constructors
     flat_set() : flat_set(key_compare()) { }
 
+    explicit flat_set(const key_compare& comp)
+      : @\exposid{c}@(), @\exposid{compare}@(comp) { }
+
     explicit flat_set(container_type cont, const key_compare& comp = key_compare());
 
     flat_set(sorted_unique_t, container_type cont, const key_compare& comp = key_compare())
       : @\exposid{c}@(std::move(cont)), @\exposid{compare}@(comp) { }
 
-    explicit flat_set(const key_compare& comp)
-      : @\exposid{c}@(), @\exposid{compare}@(comp) { }
-
     template<class InputIterator>
       flat_set(InputIterator first, InputIterator last, const key_compare& comp = key_compare())
         : @\exposid{c}@(), @\exposid{compare}@(comp)
         { insert(first, last); }
 
+    template<class InputIterator>
+      flat_set(sorted_unique_t, InputIterator first, InputIterator last,
+               const key_compare& comp = key_compare())
+        : @\exposid{c}@(first, last), @\exposid{compare}@(comp) { }
+
     template<@\exposconcept{container-compatible-range}@<value_type> R>
       flat_set(from_range_t fr, R&& rg)
         : flat_set(fr, std::forward<R>(rg), key_compare()) { }
@@ -16978,11 +16983,6 @@
         : flat_set(comp)
         { insert_range(std::forward<R>(rg)); }
 
-    template<class InputIterator>
-      flat_set(sorted_unique_t, InputIterator first, InputIterator last,
-               const key_compare& comp = key_compare())
-        : @\exposid{c}@(first, last), @\exposid{compare}@(comp) { }
-
     flat_set(initializer_list<value_type> il, const key_compare& comp = key_compare())
         : flat_set(il.begin(), il.end(), comp) { }
 
@@ -16993,9 +16993,9 @@
     // \ref{flat.set.cons.alloc}, constructors with allocators
 
     template<class Alloc>
-      flat_set(const flat_set&, const Alloc& a);
+      explicit flat_set(const Alloc& a);
     template<class Alloc>
-      flat_set(flat_set&&, const Alloc& a);
+      flat_set(const key_compare& comp, const Alloc& a);
     template<class Alloc>
       flat_set(const container_type& cont, const Alloc& a);
     template<class Alloc>
@@ -17006,32 +17006,32 @@
       flat_set(sorted_unique_t, const container_type& cont,
                const key_compare& comp, const Alloc& a);
     template<class Alloc>
-      flat_set(const key_compare& comp, const Alloc& a);
+      flat_set(const flat_set&, const Alloc& a);
     template<class Alloc>
-      explicit flat_set(const Alloc& a);
+      flat_set(flat_set&&, const Alloc& a);
+    template<class InputIterator, class Alloc>
+      flat_set(InputIterator first, InputIterator last, const Alloc& a);
     template<class InputIterator, class Alloc>
       flat_set(InputIterator first, InputIterator last,
                const key_compare& comp, const Alloc& a);
     template<class InputIterator, class Alloc>
-      flat_set(InputIterator first, InputIterator last, const Alloc& a);
+      flat_set(sorted_unique_t, InputIterator first, InputIterator last, const Alloc& a);
+    template<class InputIterator, class Alloc>
+      flat_set(sorted_unique_t, InputIterator first, InputIterator last,
+               const key_compare& comp, const Alloc& a);
     template<@\exposconcept{container-compatible-range}@<value_type> R, class Alloc>
       flat_set(from_range_t, R&& rg, const Alloc& a);
     template<@\exposconcept{container-compatible-range}@<value_type> R, class Alloc>
        flat_set(from_range_t, R&& rg, const key_compare& comp, const Alloc& a);
-    template<class InputIterator, class Alloc>
-      flat_set(sorted_unique_t, InputIterator first, InputIterator last,
-               const key_compare& comp, const Alloc& a);
-    template<class InputIterator, class Alloc>
-      flat_set(sorted_unique_t, InputIterator first, InputIterator last, const Alloc& a);
+    template<class Alloc>
+      flat_set(initializer_list<value_type> il, const Alloc& a);
     template<class Alloc>
       flat_set(initializer_list<value_type> il, const key_compare& comp, const Alloc& a);
     template<class Alloc>
-      flat_set(initializer_list<value_type> il, const Alloc& a);
+      flat_set(sorted_unique_t, initializer_list<value_type> il, const Alloc& a);
     template<class Alloc>
       flat_set(sorted_unique_t, initializer_list<value_type> il,
                const key_compare& comp, const Alloc& a);
-    template<class Alloc>
-      flat_set(sorted_unique_t, initializer_list<value_type> il, const Alloc& a);
 
     flat_set& operator=(initializer_list<value_type>);
 
@@ -17272,35 +17272,35 @@
 \indexlibraryctor{flat_set}%
 \begin{itemdecl}
 template<class Alloc>
-  flat_set(const flat_set&, const Alloc& a);
-template<class Alloc>
-  flat_set(flat_set&&, const Alloc& a);
+  explicit flat_set(const Alloc& a);
 template<class Alloc>
   flat_set(const key_compare& comp, const Alloc& a);
 template<class Alloc>
-  explicit flat_set(const Alloc& a);
+  flat_set(const flat_set&, const Alloc& a);
+template<class Alloc>
+  flat_set(flat_set&&, const Alloc& a);
+template<class InputIterator, class Alloc>
+  flat_set(InputIterator first, InputIterator last, const Alloc& a);
 template<class InputIterator, class Alloc>
   flat_set(InputIterator first, InputIterator last, const key_compare& comp, const Alloc& a);
 template<class InputIterator, class Alloc>
-  flat_set(InputIterator first, InputIterator last, const Alloc& a);
+  flat_set(sorted_unique_t, InputIterator first, InputIterator last, const Alloc& a);
+template<class InputIterator, class Alloc>
+  flat_set(sorted_unique_t, InputIterator first, InputIterator last,
+           const key_compare& comp, const Alloc& a);
 template<@\exposconcept{container-compatible-range}@<value_type> R, class Alloc>
   flat_set(from_range_t, R&& rg, const Alloc& a);
 template<@\exposconcept{container-compatible-range}@<value_type> R, class Alloc>
   flat_set(from_range_t, R&& rg, const key_compare& comp, const Alloc& a);
-template<class InputIterator, class Alloc>
-  flat_set(sorted_unique_t, InputIterator first, InputIterator last,
-           const key_compare& comp, const Alloc& a);
-template<class InputIterator, class Alloc>
-  flat_set(sorted_unique_t, InputIterator first, InputIterator last, const Alloc& a);
+template<class Alloc>
+  flat_set(initializer_list<value_type> il, const Alloc& a);
 template<class Alloc>
   flat_set(initializer_list<value_type> il, const key_compare& comp, const Alloc& a);
 template<class Alloc>
-  flat_set(initializer_list<value_type> il, const Alloc& a);
+  flat_set(sorted_unique_t, initializer_list<value_type> il, const Alloc& a);
 template<class Alloc>
   flat_set(sorted_unique_t, initializer_list<value_type> il,
            const key_compare& comp, const Alloc& a);
-template<class Alloc>
-  flat_set(sorted_unique_t, initializer_list<value_type> il, const Alloc& a);
 \end{itemdecl}
 
 \begin{itemdescr}