[containers] - C++14 → C++17

Files changed (1) hide show

tmp/tmp0osa8now/{from.md → to.md} +2227 -1093

tmp/tmp0osa8now/{from.md → to.md} RENAMED Viewed

@@ -34,46 +34,53 @@ Table  [[tab:containers.lib.summary]].
 Containers are objects that store other objects. They control allocation
 and deallocation of these objects through constructors, destructors,
 insert and erase operations.
 All of the complexity requirements in this Clause are stated solely in
-terms of the number of operations on the contained objects. the copy
-constructor of type `vector <vector<int> >` has linear complexity, even
-though the complexity of copying each contained `vector<int>` is itself
-linear.
 For the components affected by this subclause that declare an
 `allocator_type`, objects stored in these components shall be
-constructed using the `allocator_traits<allocator_type>::construct`
-function and destroyed using the
-`allocator_traits<allocator_type>::destroy` function (
-[[allocator.traits.members]]). These functions are called only for the
-container’s element type, not for internal types used by the container.
-This means, for example, that a node-based container might need to
-construct nodes containing aligned buffers and call `construct` to place
-the element into the buffer.
 In Tables  [[tab:containers.container.requirements]],
 [[tab:containers.reversible.requirements]], and
 [[tab:containers.optional.operations]] `X` denotes a container class
 containing objects of type `T`, `a` and `b` denote values of type `X`,
 `u` denotes an identifier, `r` denotes a non-const value of type `X`,
 and `rv` denotes a non-const rvalue of type `X`.
-Notes: the algorithm `equal()` is defined in Clause  [[algorithms]].
 Those entries marked “(Note A)” or “(Note B)” have linear complexity for
 `array` and have constant complexity for all other standard containers.
 The member function `size()` returns the number of elements in the
 container. The number of elements is defined by the rules of
 constructors, inserts, and erases.
 `begin()`
 returns an iterator referring to the first element in the container.
 `end()` returns an iterator which is the past-the-end value for the
-container. If the container is empty, then `begin() == end()`;
 In the expressions
 ``` cpp
 i == j
@@ -89,50 +96,59 @@ where `i` and `j` denote objects of a container’s `iterator` type,
 either or both may be replaced by an object of the container’s
 `const_iterator` type referring to the same element with no change in
 semantics.
 Unless otherwise specified, all containers defined in this clause obtain
-memory using an allocator (see  [[allocator.requirements]]). Copy
-constructors for these container types obtain an allocator by calling
 `allocator_traits<allocator_type>::select_on_container_copy_construction`
 on the allocator belonging to the container being copied. Move
 constructors obtain an allocator by move construction from the allocator
 belonging to the container being moved. Such move construction of the
 allocator shall not exit via an exception. All other constructors for
-these container types take a `const allocator_type&` argument. If an
-invocation of a constructor uses the default value of an optional
-allocator argument, then the `Allocator` type must support value
-initialization. A copy of this allocator is used for any memory
-allocation performed, by these constructors and by all member functions,
-during the lifetime of each container object or until the allocator is
-replaced. The allocator may be replaced only via assignment or `swap()`.
-Allocator replacement is performed by copy assignment, move assignment,
-or swapping of the allocator only if
 `allocator_traits<allocator_type>::propagate_on_container_copy_assignment::value`,
 `allocator_traits<allocator_type>::propagate_on_container_move_assignment::value`,
 or
 `allocator_traits<allocator_type>::propagate_on_container_swap::value`
-is true within the implementation of the corresponding container
-operation. The behavior of a call to a container’s `swap` function is
-undefined unless the objects being swapped have allocators that compare
-equal or
-`allocator_traits<allocator_type>::propagate_on_container_swap::value`
-is true. In all container types defined in this Clause, the member
 `get_allocator()` returns a copy of the allocator used to construct the
 container or, if that allocator has been replaced, a copy of the most
 recent replacement.
 The expression `a.swap(b)`, for containers `a` and `b` of a standard
 container type other than `array`, shall exchange the values of `a` and
 `b` without invoking any move, copy, or swap operations on the
-individual container elements. Any `Compare`, `Pred`, or `Hash` objects
-belonging to `a` and `b` shall be swappable and shall be exchanged by
-unqualified calls to non-member `swap`. If
 `allocator_traits<allocator_type>::propagate_on_container_swap::value`
-is `true`, then the allocators of `a` and `b` shall also be exchanged
-using an unqualified call to non-member `swap`. Otherwise, they shall
-not be swapped, and the behavior is undefined unless
 `a.get_allocator() == b.get_allocator()`. Every iterator referring to an
 element in one container before the swap shall refer to the same element
 in the other container after the swap. It is unspecified whether an
 iterator with value `a.end()` before the swap will have value `b.end()`
 after the swap.
@@ -157,39 +173,45 @@ requirements:
 - no copy constructor or assignment operator of a returned iterator
   throws an exception.
 - no `swap()` function throws an exception.
 - no `swap()` function invalidates any references, pointers, or
   iterators referring to the elements of the containers being swapped.
-  The `end()` iterator does not refer to any element, so it may be
-  invalidated.
 Unless otherwise specified (either explicitly or by defining a function
 in terms of other functions), invoking a container member function or
 passing a container as an argument to a library function shall not
 invalidate iterators to, or change the values of, objects within that
 container.
 Table  [[tab:containers.optional.operations]] lists operations that are
 provided for some types of containers but not others. Those containers
 for which the listed operations are provided shall implement the
 semantics described in Table  [[tab:containers.optional.operations]]
 unless otherwise stated.
-Note: the algorithm `lexicographical_compare()` is defined in Clause
-[[algorithms]].
-All of the containers defined in this Clause and in ([[basic.string]])
 except `array` meet the additional requirements of an allocator-aware
 container, as described in Table  [[tab:containers.allocatoraware]].
-Given a container type `X` having an `allocator_type` identical to `A`
-and a `value_type` identical to `T` and given an lvalue `m` of type `A`,
-a pointer `p` of type `T*`, an expression `v` of type (possibly const)
-`T`, and an rvalue `rv` of type `T`, the following terms are defined. If
-`X` is not allocator-aware, the terms below are defined as if `A` were
-`std::allocator<T>` — no allocator object needs to be created and user
-specializations of `std::allocator<T>` are not instantiated:
 - `T` is *`DefaultInsertable` into `X`* means that the following
   expression is well-formed:
   ``` cpp
   allocator_traits<A>::construct(m, p)
@@ -208,11 +230,13 @@ specializations of `std::allocator<T>` are not instantiated:
   allocator_traits<A>::construct(m, p, rv)
   ```
   and its evaluation causes the following postcondition to hold: The
   value of `*p` is equivalent to the value of `rv` before the
-  evaluation. rv remains a valid object. Its state is unspecified
 - `T` is *`CopyInsertable` into `X`* means that, in addition to `T`
   being `MoveInsertable` into `X`, the following expression is
   well-formed:
   ``` cpp
   allocator_traits<A>::construct(m, p, v)
@@ -229,40 +253,56 @@ specializations of `std::allocator<T>` are not instantiated:
   well-formed:
   ``` cpp
   allocator_traits<A>::destroy(m, p)
   ```
-A container calls `allocator_traits<A>::construct(m, p, args)` to
-construct an element at `p` using `args`. The default `construct` in
-`std::allocator` will call `::new((void*)p) T(args)`, but specialized
-allocators may choose a different definition.
 In Table  [[tab:containers.allocatoraware]], `X` denotes an
 allocator-aware container class with a `value_type` of `T` using
 allocator of type `A`, `u` denotes a variable, `a` and `b` denote
 non-const lvalues of type `X`, `t` denotes an lvalue or a const rvalue
 of type `X`, `rv` denotes a non-const rvalue of type `X`, and `m` is a
 value of type `A`.
 ### Container data races <a id="container.requirements.dataraces">[[container.requirements.dataraces]]</a>
 For purposes of avoiding data races ([[res.on.data.races]]),
 implementations shall consider the following functions to be `const`:
 `begin`, `end`, `rbegin`, `rend`, `front`, `back`, `data`, `find`,
 `lower_bound`, `upper_bound`, `equal_range`, `at` and, except in
 associative or unordered associative containers, `operator[]`.
-Notwithstanding ([[res.on.data.races]]), implementations are required
-to avoid data races when the contents of the contained object in
-different elements in the same container, excepting `vector<bool>`, are
-modified concurrently.
-For a `vector<int> x` with a size greater than one, `x[1] = 5` and
-`*x.begin() = 10` can be executed concurrently without a data race, but
-`x[0] = 5` and `*x.begin() = 10` executed concurrently may result in a
-data race. As an exception to the general rule, for a `vector<bool> y`,
-`y[0] = true` may race with `y[1] = true`.
 ### Sequence containers <a id="sequence.reqmts">[[sequence.reqmts]]</a>
 A sequence container organizes a finite set of objects, all of the same
 type, into a strictly linear arrangement. The library provides four
@@ -282,30 +322,28 @@ deletions from the middle of the sequence. `deque` is the data structure
 of choice when most insertions and deletions take place at the beginning
 or at the end of the sequence.
 In Tables  [[tab:containers.sequence.requirements]] and
 [[tab:containers.sequence.optional]], `X` denotes a sequence container
-class, `a` denotes a value of `X` containing elements of type `T`, `A`
-denotes `X::allocator_type` if it exists and `std::allocator<T>` if it
-doesn’t, `i` and `j` denote iterators satisfying input iterator
-requirements and refer to elements implicitly convertible to
-`value_type`, `[i, j)` denotes a valid range, `il` designates an object
-of type `initializer_list<value_type>`, `n` denotes a value of
-`X::size_type`, `p` denotes a valid const iterator to `a`, `q` denotes a
-valid dereferenceable const iterator to `a`, `[q1, q2)` denotes a valid
-range of const iterators in `a`, `t` denotes an lvalue or a const rvalue
-of `X::value_type`, and `rv` denotes a non-const rvalue of
-`X::value_type`. `Args` denotes a template parameter pack; `args`
-denotes a function parameter pack with the pattern `Args&&`.
 The complexities of the expressions are sequence dependent.
-`iterator`
-and `const_iterator` types for sequence containers shall be at least of
-the forward iterator category.
 The iterator returned from `a.insert(p, t)` points to the copy of `t`
 inserted into `a`.
 The iterator returned from `a.insert(p, rv)` points to the copy of `rv`
 inserted into `a`.
@@ -335,45 +373,271 @@ For every sequence container defined in this Clause and in Clause
 - If the constructor
   ``` cpp
   template <class InputIterator>
     X(InputIterator first, InputIterator last,
- const allocator_type& alloc = allocator_type())
   ```
   is called with a type `InputIterator` that does not qualify as an
   input iterator, then the constructor shall not participate in overload
   resolution.
 - If the member functions of the forms:
   ``` cpp
-  template <class InputIterator>          // such as insert()
-  rt fx1(const_iterator p, InputIterator first, InputIterator last);
-  template <class InputIterator>          // such as append(), assign()
-  rt fx2(InputIterator first, InputIterator last);
-  template <class InputIterator>          // such as replace()
-  rt fx3(const_iterator i1, const_iterator i2, InputIterator first, InputIterator last);
   ```
   are called with a type `InputIterator` that does not qualify as an
   input iterator, then these functions shall not participate in overload
   resolution.
-The extent to which an implementation determines that a type cannot be
-an input iterator is unspecified, except that as a minimum integral
-types shall not qualify as input iterators.
 Table  [[tab:containers.sequence.optional]] lists operations that are
 provided for some types of sequence containers but not others. An
 implementation shall provide these operations for all container types
 shown in the “container” column, and shall implement them so as to take
 amortized constant time.
 The member function `at()` provides bounds-checked access to container
 elements. `at()` throws `out_of_range` if `n >= a.size()`.
 ### Associative containers <a id="associative.reqmts">[[associative.reqmts]]</a>
 Associative containers provide fast retrieval of data based on keys. The
 library provides four basic kinds of associative containers: `set`,
 `multiset`, `map` and `multimap`.
@@ -405,65 +669,82 @@ For `set` and `multiset` the value type is the same as the key type. For
 of an associative container is of the bidirectional iterator category.
 For associative containers where the value type is the same as the key
 type, both `iterator` and `const_iterator` are constant iterators. It is
 unspecified whether or not `iterator` and `const_iterator` are the same
-type. `iterator` and `const_iterator` have identical semantics in this
-case, and `iterator` is convertible to `const_iterator`. Users can avoid
-violating the One Definition Rule by always using `const_iterator` in
-their function parameter lists.
 The associative containers meet all the requirements of Allocator-aware
 containers ([[container.requirements.general]]), except that for `map`
 and `multimap`, the requirements placed on `value_type` in Table
 [[tab:containers.container.requirements]] apply instead to `key_type`
-and `mapped_type`. For example, in some cases `key_type` and
-`mapped_type` are required to be `CopyAssignable` even though the
-associated `value_type`, `pair<const key_type, mapped_type>`, is not
-`CopyAssignable`.
 In Table  [[tab:containers.associative.requirements]], `X` denotes an
-associative container class, `a` denotes a value of `X`, `a_uniq`
-denotes a value of `X` when `X` supports unique keys, `a_eq` denotes a
-value of `X` when `X` supports multiple keys, `a_tran` denotes a value
-of `X` when the qualified-id `X::key_compare::is_transparent` is valid
-and denotes a type ([[temp.deduct]]), `i` and `j` satisfy input
-iterator requirements and refer to elements implicitly convertible to
-`value_type`, \[`i`, `j`) denotes a valid range, `p` denotes a valid
-const iterator to `a`, `q` denotes a valid dereferenceable const
-iterator to `a`, `[q1, q2)` denotes a valid range of const iterators in
-`a`, `il` designates an object of type `initializer_list<value_type>`,
-`t` denotes a value of `X::value_type`, `k` denotes a value of
-`X::key_type` and `c` denotes a value of type `X::key_compare`; `kl` is
-a value such that `a` is partitioned ([[alg.sorting]]) with respect to
 `c(r, kl)`, with `r` the key value of `e` and `e` in `a`; `ku` is a
 value such that `a` is partitioned with respect to `!c(ku, r)`; `ke` is
 a value such that `a` is partitioned with respect to `c(r, ke)` and
 `!c(ke, r)`, with `c(r, ke)` implying `!c(ke, r)`. `A` denotes the
-storage allocator used by `X`, if any, or
-`std::allocator<X::value_type>` otherwise, and `m` denotes an allocator
-of a type convertible to `A`.
 The `insert` and `emplace` members shall not affect the validity of
 iterators and references to the container, and the `erase` members shall
 invalidate only iterators and references to the erased elements.
 The fundamental property of iterators of associative containers is that
 they iterate through the containers in the non-descending order of keys
 where non-descending is defined by the comparison that was used to
 construct them. For any two dereferenceable iterators `i` and `j` such
-that distance from `i` to `j` is positive,
 ``` cpp
 value_comp(*j, *i) == false
 ```
 For associative containers with unique keys the stronger condition
-holds,
 ``` cpp
-value_comp(*i, *j) != false.
 ```
 When an associative container is constructed by passing a comparison
 object the container shall not store a pointer or reference to the
 passed object, even if that object is passed by reference. When an
@@ -472,13 +753,23 @@ assignment operator, the target container shall then use the comparison
 object from the container being copied, as if that comparison object had
 been passed to the target container in its constructor.
 The member function templates `find`, `count`, `lower_bound`,
 `upper_bound`, and `equal_range` shall not participate in overload
-resolution unless the qualified-id `Compare::is_transparent` is valid
 and denotes a type ([[temp.deduct]]).
 #### Exception safety guarantees <a id="associative.reqmts.except">[[associative.reqmts.except]]</a>
 For associative containers, no `clear()` function throws an exception.
 `erase(k)` does not throw an exception unless that exception is thrown
 by the container’s `Compare` object (if any).
@@ -518,42 +809,47 @@ the *hash function* of the container. The container’s object of type
 the container.
 Two values `k1` and `k2` of type `Key` are considered equivalent if the
 container’s key equality predicate returns `true` when passed those
 values. If `k1` and `k2` are equivalent, the container’s hash function
-shall return the same value for both. Thus, when an unordered
-associative container is instantiated with a non-default `Pred`
-parameter it usually needs a non-default `Hash` parameter as well. For
-any two keys `k1` and `k2` in the same container, calling `pred(k1, k2)`
-shall always return the same value. For any key `k` in a container,
-calling `hash(k)` shall always return the same value.
 An unordered associative container supports *unique keys* if it may
 contain at most one element for each key. Otherwise, it supports
 *equivalent keys*. `unordered_set` and `unordered_map` support unique
 keys. `unordered_multiset` and `unordered_multimap` support equivalent
 keys. In containers that support equivalent keys, elements with
 equivalent keys are adjacent to each other in the iteration order of the
 container. Thus, although the absolute order of elements in an unordered
 container is not specified, its elements are grouped into
-*equivalent-key group*s such that all elements of each group have
 equivalent keys. Mutating operations on unordered containers shall
 preserve the relative order of elements within each equivalent-key group
 unless otherwise specified.
 For `unordered_set` and `unordered_multiset` the value type is the same
 as the key type. For `unordered_map` and `unordered_multimap` it is
-`std::pair<const Key,
 T>`.
 For unordered containers where the value type is the same as the key
 type, both `iterator` and `const_iterator` are constant iterators. It is
 unspecified whether or not `iterator` and `const_iterator` are the same
-type. `iterator` and `const_iterator` have identical semantics in this
-case, and `iterator` is convertible to `const_iterator`. Users can avoid
-violating the One Definition Rule by always using `const_iterator` in
-their function parameter lists.
 The elements of an unordered associative container are organized into
 *buckets*. Keys with the same hash code appear in the same bucket. The
 number of buckets is automatically increased as elements are added to an
 unordered associative container, so that the average number of elements
@@ -566,37 +862,43 @@ the relative ordering of equivalent elements.
 The unordered associative containers meet all the requirements of
 Allocator-aware containers ([[container.requirements.general]]), except
 that for `unordered_map` and `unordered_multimap`, the requirements
 placed on `value_type` in Table
 [[tab:containers.container.requirements]] apply instead to `key_type`
-and `mapped_type`. For example, `key_type` and `mapped_type` are
-sometimes required to be `CopyAssignable` even though the associated
-`value_type`, `pair<const key_type, mapped_type>`, is not
-`CopyAssignable`.
-In table  [[tab:HashRequirements]]: `X` is an unordered associative
-container class, `a` is an object of type `X`, `b` is a possibly const
-object of type `X`, `a_uniq` is an object of type `X` when `X` supports
-unique keys, `a_eq` is an object of type `X` when `X` supports
-equivalent keys, `i` and `j` are input iterators that refer to
-`value_type`, `[i, j)` is a valid range, `p` and `q2` are valid const
-iterators to `a`, `q` and `q1` are valid dereferenceable const iterators
-to `a`, `[q1, q2)` is a valid range in `a`, `il` designates an object of
-type `initializer_list<value_type>`, `t` is a value of type
-`X::value_type`, `k` is a value of type `key_type`, `hf` is a possibly
-const value of type `hasher`, `eq` is a possibly const value of type
-`key_equal`, `n` is a value of type `size_type`, and `z` is a value of
-type `float`.
 Two unordered containers `a` and `b` compare equal if
 `a.size() == b.size()` and, for every equivalent-key group \[`Ea1`,
 `Ea2`) obtained from `a.equal_range(Ea1)`, there exists an
 equivalent-key group \[`Eb1`, `Eb2`) obtained from `b.equal_range(Ea1)`,
 such that `is_permutation(Ea1, Ea2, Eb1, Eb2)` returns `true`. For
 `unordered_set` and `unordered_map`, the complexity of `operator==`
 (i.e., the number of calls to the `==` operator of the `value_type`, to
-the predicate returned by `key_equal()`, and to the hasher returned by
 `hash_function()`) is proportional to N in the average case and to N² in
 the worst case, where N is a.size(). For `unordered_multiset` and
 `unordered_multimap`, the complexity of `operator==` is proportional to
 $\sum E_i^2$ in the average case and to N² in the worst case, where N is
 `a.size()`, and Eᵢ is the size of the iᵗʰ equivalent-key group in `a`.
@@ -607,31 +909,51 @@ same container), then the average-case complexity for
 `unordered_multiset` and `unordered_multimap` becomes proportional to N
 (but worst-case complexity remains 𝑂(N^2), e.g., for a pathologically
 bad hash function). The behavior of a program that uses `operator==` or
 `operator!=` on unordered containers is undefined unless the `Hash` and
 `Pred` function objects respectively have the same behavior for both
-containers and the equality comparison operator for `Key` is a
 refinement[^1] of the partition into equivalent-key groups produced by
 `Pred`.
 The iterator types `iterator` and `const_iterator` of an unordered
 associative container are of at least the forward iterator category. For
 unordered associative containers where the key type and value type are
-the same, both `iterator` and `const_iterator` are const iterators.
 The `insert` and `emplace` members shall not affect the validity of
 references to container elements, but may invalidate all iterators to
 the container. The `erase` members shall invalidate only iterators and
 references to the erased elements, and preserve the relative order of
 the elements that are not erased.
 The `insert` and `emplace` members shall not affect the validity of
-iterators if `(N+n) < z * B`, where `N` is the number of elements in the
-container prior to the insert operation, `n` is the number of elements
-inserted, `B` is the container’s bucket count, and `z` is the
 container’s maximum load factor.
 #### Exception safety guarantees <a id="unord.req.except">[[unord.req.except]]</a>
 For unordered associative containers, no `clear()` function throws an
 exception. `erase(k)` does not throw an exception unless that exception
 is thrown by the container’s `Hash` or `Pred` object (if any).
@@ -641,34 +963,31 @@ operation other than the container’s hash function from within an
 `insert` or `emplace` function inserting a single element, the insertion
 has no effect.
 For unordered associative containers, no `swap` function throws an
 exception unless that exception is thrown by the swap of the container’s
-Hash or Pred object (if any).
 For unordered associative containers, if an exception is thrown from
 within a `rehash()` function other than by the container’s hash function
 or comparison function, the `rehash()` function has no effect.
 ## Sequence containers <a id="sequences">[[sequences]]</a>
 ### In general <a id="sequences.general">[[sequences.general]]</a>
 The headers `<array>`, `<deque>`, `<forward_list>`, `<list>`, and
-`<vector>` define template classes that meet the requirements for
 sequence containers.
-The headers `<queue>` and `<stack>` define container adaptors (
-[[container.adaptors]]) that also meet the requirements for sequence
-containers.
-\synopsis{Header \texttt{\<array\>} synopsis}
 ``` cpp
 #include <initializer_list>
 namespace std {
   template <class T, size_t N> struct array;
   template <class T, size_t N>
     bool operator==(const array<T, N>& x, const array<T, N>& y);
   template <class T, size_t N>
     bool operator!=(const array<T, N>& x, const array<T, N>& y);
@@ -693,19 +1012,22 @@ namespace std {
     constexpr T& get(array<T, N>&) noexcept;
   template <size_t I, class T, size_t N>
     constexpr T&& get(array<T, N>&&) noexcept;
   template <size_t I, class T, size_t N>
     constexpr const T& get(const array<T, N>&) noexcept;
 }
 ```
-\synopsis{Header \texttt{\<deque\>} synopsis}
 ``` cpp
 #include <initializer_list>
 namespace std {
   template <class T, class Allocator = allocator<T>> class deque;
   template <class T, class Allocator>
     bool operator==(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const deque<T, Allocator>& x, const deque<T, Allocator>& y);
@@ -716,20 +1038,27 @@ namespace std {
   template <class T, class Allocator>
     bool operator>=(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
-    void swap(deque<T,Allocator>& x, deque<T,Allocator>& y);
 }
 ```
-\synopsis{Header \texttt{\<forward_list\>} synopsis}
 ``` cpp
 #include <initializer_list>
 namespace std {
   template <class T, class Allocator = allocator<T>> class forward_list;
   template <class T, class Allocator>
     bool operator==(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
@@ -740,20 +1069,27 @@ namespace std {
   template <class T, class Allocator>
     bool operator>=(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
-    void swap(forward_list<T,Allocator>& x, forward_list<T,Allocator>& y);
 }
 ```
-\synopsis{Header \texttt{\<list\>} synopsis}
 ``` cpp
 #include <initializer_list>
 namespace std {
   template <class T, class Allocator = allocator<T>> class list;
   template <class T, class Allocator>
     bool operator==(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const list<T, Allocator>& x, const list<T, Allocator>& y);
@@ -764,20 +1100,27 @@ namespace std {
   template <class T, class Allocator>
     bool operator>=(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
-    void swap(list<T,Allocator>& x, list<T,Allocator>& y);
 }
 ```
-\synopsis{Header \texttt{\<vector\>} synopsis}
 ``` cpp
 #include <initializer_list>
 namespace std {
   template <class T, class Allocator = allocator<T>> class vector;
   template <class T, class Allocator>
     bool operator==(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const vector<T, Allocator>& x, const vector<T, Allocator>& y);
@@ -788,40 +1131,39 @@ namespace std {
   template <class T, class Allocator>
     bool operator>=(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
-    void swap(vector<T,Allocator>& x, vector<T,Allocator>& y);
   template <class Allocator> class vector<bool, Allocator>;
   // hash support
   template <class T> struct hash;
   template <class Allocator> struct hash<vector<bool, Allocator>>;
 }
 ```
 ### Class template `array` <a id="array">[[array]]</a>
 #### Class template `array` overview <a id="array.overview">[[array.overview]]</a>
 The header `<array>` defines a class template for storing fixed-size
-sequences of objects. An `array` supports random access iterators. An
-instance of `array<T, N>` stores `N` elements of type `T`, so that
-`size() == N` is an invariant. The elements of an `array` are stored
-contiguously, meaning that if `a` is an `array<T, N>` then it obeys the
-identity `&a[n] == &a[0] + n` for all `0 <= n < N`.
-An `array` is an aggregate ([[dcl.init.aggr]]) that can be initialized
-with the syntax
-``` cpp
-array<T, N> a = { initializer-list };
-```
-where *initializer-list* is a comma-separated list of up to `N` elements
-whose types are convertible to `T`.
 An `array` satisfies all of the requirements of a container and of a
 reversible container ([[container.requirements]]), except that a
 default constructed `array` object is not empty and that `swap` does not
 have constant complexity. An `array` satisfies some of the requirements
@@ -833,70 +1175,67 @@ semantic information.
 ``` cpp
 namespace std {
   template <class T, size_t N>
   struct array {
     //  types:
- typedef T&                                    reference;
- typedef const T&                              const_reference;
- typedef implementation-defined  // type of array::iterator                iterator;
- typedef implementation-defined  // type of array::const_iterator                const_iterator;
- typedef size_t                                size_type;
- typedef ptrdiff_t                             difference_type;
- typedef T                                     value_type;
- typedef T*                                    pointer;
- typedef const T*                              const_pointer;
- typedef std::reverse_iterator<iterator>       reverse_iterator;
- typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-    T       elems[N];           // exposition only
     // no explicit construct/copy/destroy for aggregate type
     void fill(const T& u);
-    void swap(array&) noexcept(noexcept(swap(declval<T&>(), declval<T&>())));
     // iterators:
-    iterator               begin() noexcept;
-    const_iterator         begin() const noexcept;
-    iterator               end() noexcept;
-    const_iterator         end() const noexcept;
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-    const_iterator         cbegin() const noexcept;
-    const_iterator         cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
     // capacity:
     constexpr size_type size() const noexcept;
     constexpr size_type max_size() const noexcept;
-    constexpr bool      empty() const noexcept;
     // element access:
-    reference operator[](size_type n);
     constexpr const_reference operator[](size_type n) const;
-    reference at(size_type n);
     constexpr const_reference at(size_type n) const;
-    reference front();
     constexpr const_reference front() const;
-    reference back();
     constexpr const_reference back() const;
-    T *       data() noexcept;
-    const T * data() const noexcept;
   };
 }
 ```
-The member variable `elems` is shown for exposition only, to emphasize
-that `array` is a class aggregate. The name `elems` is not part of
-`array`’s interface.
 #### `array` constructors, copy, and assignment <a id="array.cons">[[array.cons]]</a>
 The conditions for an aggregate ([[dcl.init.aggr]]) shall be met. Class
 `array` relies on the implicitly-declared special member functions (
 [[class.ctor]], [[class.dtor]], and [[class.copy]]) to conform to the
@@ -904,63 +1243,70 @@ container requirements table in  [[container.requirements]]. In addition
 to the requirements specified in the container requirements table, the
 implicit move constructor and move assignment operator for `array`
 require that `T` be `MoveConstructible` or `MoveAssignable`,
 respectively.
 #### `array` specialized algorithms <a id="array.special">[[array.special]]</a>
 ``` cpp
-template <class T, size_t N> void swap(array<T,N>& x, array<T,N>& y) noexcept(noexcept(x.swap(y)));
 ```
-*Effects:*
-``` cpp
-x.swap(y);
-```
 *Complexity:* Linear in `N`.
 #### `array::size` <a id="array.size">[[array.size]]</a>
 ``` cpp
 template <class T, size_t N> constexpr size_type array<T, N>::size() const noexcept;
 ```
-*Returns:* `N`
 #### `array::data` <a id="array.data">[[array.data]]</a>
 ``` cpp
-T* data() noexcept;
-const T* data() const noexcept;
 ```
-*Returns:* `elems`.
 #### `array::fill` <a id="array.fill">[[array.fill]]</a>
 ``` cpp
 void fill(const T& u);
 ```
-*Effects:* `fill_n(begin(), N, u)`
 #### `array::swap` <a id="array.swap">[[array.swap]]</a>
 ``` cpp
-void swap(array& y) noexcept(noexcept(swap(declval<T&>(), declval<T&>())));
 ```
-*Effects:* `swap_ranges(begin(), end(), y.begin())`
-*Throws:* Nothing unless one of the element-wise swap calls throws an
-exception.
-*Note:* Unlike the `swap` function for other containers, `array::swap`
-takes linear time, may exit via an exception, and does not cause
-iterators to become associated with the other container.
 #### Zero sized arrays <a id="array.zero">[[array.zero]]</a>
 `array` shall provide support for the special case `N == 0`.
@@ -968,19 +1314,18 @@ In the case that `N == 0`, `begin() == end() ==` unique value. The
 return value of `data()` is unspecified.
 The effect of calling `front()` or `back()` for a zero-sized array is
 undefined.
-Member function `swap()` shall have a *noexcept-specification* which is
-equivalent to `noexcept(true)`.
 #### Tuple interface to class template `array` <a id="array.tuple">[[array.tuple]]</a>
 ``` cpp
 template <class T, size_t N>
-struct tuple_size<array<T, N>>
-  : integral_constant<size_t, N> { };
 ```
 ``` cpp
 tuple_element<I, array<T, N>>::type
 ```
@@ -990,44 +1335,33 @@ tuple_element<I, array<T, N> >::type
 *Value:* The type T.
 ``` cpp
 template <size_t I, class T, size_t N>
   constexpr T& get(array<T, N>& a) noexcept;
-```
-*Requires:* `I < N`. The program is ill-formed if `I` is out of bounds.
-*Returns:* A reference to the `I`th element of `a`, where indexing is
-zero-based.
-``` cpp
 template <size_t I, class T, size_t N>
   constexpr T&& get(array<T, N>&& a) noexcept;
-```
-*Effects:* Equivalent to `return std::move(get<I>(a));`
-``` cpp
 template <size_t I, class T, size_t N>
   constexpr const T& get(const array<T, N>& a) noexcept;
 ```
 *Requires:* `I < N`. The program is ill-formed if `I` is out of bounds.
-*Returns:* A const reference to the `I`th element of `a`, where indexing
-is zero-based.
 ### Class template `deque` <a id="deque">[[deque]]</a>
 #### Class template `deque` overview <a id="deque.overview">[[deque.overview]]</a>
-A `deque` is a sequence container that, like a `vector` ([[vector]]),
-supports random access iterators. In addition, it supports constant time
 insert and erase operations at the beginning or the end; insert and
 erase in the middle take linear time. That is, a deque is especially
-optimized for pushing and popping elements at the beginning and end. As
-with vectors, storage management is handled automatically.
 A `deque` satisfies all of the requirements of a container, of a
 reversible container (given in tables in  [[container.requirements]]),
 of a sequence container, including the optional sequence container
 requirements ([[sequence.reqmts]]), and of an allocator-aware container
@@ -1040,24 +1374,24 @@ information.
 namespace std {
   template <class T, class Allocator = allocator<T>>
   class deque {
   public:
     // types:
- typedef value_type&                           reference;
- typedef const value_type&                     const_reference;
- typedef implementation-defined iterator;       // See [container.requirements]
- typedef implementation-defined                const_iterator; // See [container.requirements]
- typedef implementation-defined                size_type;      // See [container.requirements]
- typedef implementation-defined                difference_type;// See [container.requirements]
- typedef T                                     value_type;
- typedef Allocator                             allocator_type;
- typedef typename allocator_traits<Allocator>::pointer           pointer;
- typedef typename allocator_traits<Allocator>::const_pointer     const_pointer;
- typedef std::reverse_iterator<iterator>       reverse_iterator;
- typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-    // [deque.cons], construct/copy/destroy:
     deque() : deque(Allocator()) { }
     explicit deque(const Allocator&);
     explicit deque(size_type n, const Allocator& = Allocator());
     deque(size_type n, const T& value, const Allocator& = Allocator());
     template <class InputIterator>
@@ -1068,11 +1402,12 @@ namespace std {
     deque(deque&&, const Allocator&);
     deque(initializer_list<T>, const Allocator& = Allocator());
     ~deque();
     deque& operator=(const deque& x);
-    deque& operator=(deque&& x);
     deque& operator=(initializer_list<T>);
     template <class InputIterator>
       void assign(InputIterator first, InputIterator last);
     void assign(size_type n, const T& t);
     void assign(initializer_list<T>);
@@ -1091,17 +1426,17 @@ namespace std {
     const_iterator         cbegin() const noexcept;
     const_iterator         cend() const noexcept;
     const_reverse_iterator crbegin() const noexcept;
     const_reverse_iterator crend() const noexcept;
-    // [deque.capacity], capacity:
     size_type size() const noexcept;
     size_type max_size() const noexcept;
     void      resize(size_type sz);
     void      resize(size_type sz, const T& c);
     void      shrink_to_fit();
-    bool      empty() const noexcept;
     // element access:
     reference       operator[](size_type n);
     const_reference operator[](size_type n) const;
     reference       at(size_type n);
@@ -1109,13 +1444,13 @@ namespace std {
     reference       front();
     const_reference front() const;
     reference       back();
     const_reference back() const;
-    // [deque.modifiers], modifiers:
-    template <class... Args> void emplace_front(Args&&... args);
-    template <class... Args> void emplace_back(Args&&... args);
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);
     void push_front(const T& x);
     void push_front(T&& x);
     void push_back(const T& x);
@@ -1131,14 +1466,20 @@ namespace std {
     void pop_front();
     void pop_back();
     iterator erase(const_iterator position);
     iterator erase(const_iterator first, const_iterator last);
-    void     swap(deque&);
     void     clear() noexcept;
   };
   template <class T, class Allocator>
     bool operator==(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
@@ -1148,13 +1489,14 @@ namespace std {
   template <class T, class Allocator>
     bool operator>=(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
-  // specialized algorithms:
   template <class T, class Allocator>
-    void swap(deque<T,Allocator>& x, deque<T,Allocator>& y);
 }
 ```
 #### `deque` constructors, copy, and assignment <a id="deque.cons">[[deque.cons]]</a>
@@ -1176,12 +1518,11 @@ the specified allocator.
 *Requires:* `T` shall be `DefaultInsertable` into `*this`.
 *Complexity:* Linear in `n`.
 ``` cpp
-deque(size_type n, const T& value,
-      const Allocator& = Allocator());
 ```
 *Effects:* Constructs a `deque` with `n` copies of `value`, using the
 specified allocator.
@@ -1189,12 +1530,11 @@ specified allocator.
 *Complexity:* Linear in `n`.
 ``` cpp
 template <class InputIterator>
-  deque(InputIterator first, InputIterator last,
-        const Allocator& = Allocator());
 ```
 *Effects:* Constructs a `deque` equal to the range \[`first`, `last`),
 using the specified allocator.
@@ -1204,38 +1544,47 @@ using the specified allocator.
 ``` cpp
 void resize(size_type sz);
 ```
-*Effects:* If `sz <= size()`, equivalent to calling `pop_back()`
-`size() - sz` times. If `size() < sz`, appends `sz - size()`
-default-inserted elements to the sequence.
 *Requires:* `T` shall be `MoveInsertable` and `DefaultInsertable` into
 `*this`.
 ``` cpp
 void resize(size_type sz, const T& c);
 ```
-*Effects:* If `sz <= size()`, equivalent to calling `pop_back()`
-`size() - sz` times. If `size() < sz`, appends `sz - size()` copies of
-`c` to the sequence.
 *Requires:* `T` shall be `CopyInsertable` into `*this`.
 ``` cpp
 void shrink_to_fit();
 ```
 *Requires:* `T` shall be `MoveInsertable` into `*this`.
 *Complexity:* Linear in the size of the sequence.
-*Remarks:* `shrink_to_fit` is a non-binding request to reduce memory use
-but does not change the size of the sequence. The request is non-binding
-to allow latitude for implementation-specific optimizations.
 #### `deque` modifiers <a id="deque.modifiers">[[deque.modifiers]]</a>
 ``` cpp
 iterator insert(const_iterator position, const T& x);
@@ -1244,12 +1593,12 @@ iterator insert(const_iterator position, size_type n, const T& x);
 template <class InputIterator>
   iterator insert(const_iterator position,
                   InputIterator first, InputIterator last);
 iterator insert(const_iterator position, initializer_list<T>);
-template <class... Args> void emplace_front(Args&&... args);
-template <class... Args> void emplace_back(Args&&... args);
 template <class... Args> iterator emplace(const_iterator position, Args&&... args);
 void push_front(const T& x);
 void push_front(T&& x);
 void push_back(const T& x);
 void push_back(T&& x);
@@ -1274,54 +1623,58 @@ a deque always takes constant time and causes a single call to a
 constructor of `T`.
 ``` cpp
 iterator erase(const_iterator position);
 iterator erase(const_iterator first, const_iterator last);
 ```
 *Effects:* An erase operation that erases the last element of a deque
 invalidates only the past-the-end iterator and all iterators and
 references to the erased elements. An erase operation that erases the
-first element of a deque but not the last element invalidates only the
-erased elements. An erase operation that erases neither the first
-element nor the last element of a deque invalidates the past-the-end
-iterator and all iterators and references to all the elements of the
-deque.
-*Complexity:* The number of calls to the destructor is the same as the
-number of elements erased, but the number of calls to the assignment
-operator is no more than the lesser of the number of elements before the
-erased elements and the number of elements after the erased elements.
 *Throws:* Nothing unless an exception is thrown by the copy constructor,
 move constructor, assignment operator, or move assignment operator of
 `T`.
 #### `deque` specialized algorithms <a id="deque.special">[[deque.special]]</a>
 ``` cpp
 template <class T, class Allocator>
-  void swap(deque<T,Allocator>& x, deque<T,Allocator>& y);
 ```
-*Effects:*
-``` cpp
-x.swap(y);
-```
 ### Class template `forward_list` <a id="forwardlist">[[forwardlist]]</a>
 #### Class template `forward_list` overview <a id="forwardlist.overview">[[forwardlist.overview]]</a>
 A `forward_list` is a container that supports forward iterators and
 allows constant time insert and erase operations anywhere within the
 sequence, with storage management handled automatically. Fast random
-access to list elements is not supported. It is intended that
-`forward_list` have zero space or time overhead relative to a
-hand-written C-style singly linked list. Features that would conflict
-with that goal have been omitted.
 A `forward_list` satisfies all of the requirements of a container
 (Table  [[tab:containers.container.requirements]]), except that the
 `size()` member function is not provided and `operator==` has linear
 complexity. A `forward_list` also satisfies all of the requirements for
@@ -1331,34 +1684,34 @@ In addition, a `forward_list` provides the `assign` member functions
 optional container requirements (Table
 [[tab:containers.sequence.optional]]). Descriptions are provided here
 only for operations on `forward_list` that are not described in that
 table or for operations where there is additional semantic information.
-Modifying any list requires access to the element preceding the first
-element of interest, but in a `forward_list` there is no constant-time
-way to access a preceding element. For this reason, ranges that are
-modified, such as those supplied to `erase` and `splice`, must be open
-at the beginning.
 ``` cpp
 namespace std {
   template <class T, class Allocator = allocator<T>>
   class forward_list {
   public:
     // types:
- typedef value_type&                                           reference;
- typedef const value_type&                                     const_reference;
- typedef implementation-defined iterator;       // See [container.requirements]
- typedef implementation-defined const_iterator; // See [container.requirements]
- typedef implementation-defined size_type;      // See [container.requirements]
- typedef implementation-defined difference_type;// See [container.requirements]
- typedef T value_type;
- typedef Allocator allocator_type;
- typedef typename allocator_traits<Allocator>::pointer         pointer;
- typedef typename allocator_traits<Allocator>::const_pointer   const_pointer;
-    // [forwardlist.cons], construct/copy/destroy:
     forward_list() : forward_list(Allocator()) { }
     explicit forward_list(const Allocator&);
     explicit forward_list(size_type n, const Allocator& = Allocator());
     forward_list(size_type n, const T& value,
                  const Allocator& = Allocator());
@@ -1370,19 +1723,20 @@ namespace std {
     forward_list(const forward_list& x, const Allocator&);
     forward_list(forward_list&& x, const Allocator&);
     forward_list(initializer_list<T>, const Allocator& = Allocator());
     ~forward_list();
     forward_list& operator=(const forward_list& x);
-    forward_list& operator=(forward_list&& x);
     forward_list& operator=(initializer_list<T>);
     template <class InputIterator>
       void assign(InputIterator first, InputIterator last);
     void assign(size_type n, const T& t);
     void assign(initializer_list<T>);
     allocator_type get_allocator() const noexcept;
-    // [forwardlist.iter], iterators:
     iterator before_begin() noexcept;
     const_iterator before_begin() const noexcept;
     iterator begin() noexcept;
     const_iterator begin() const noexcept;
     iterator end() noexcept;
@@ -1394,16 +1748,16 @@ namespace std {
     // capacity:
     bool      empty() const noexcept;
     size_type max_size() const noexcept;
-    // [forwardlist.access], element access:
     reference front();
     const_reference front() const;
-    // [forwardlist.modifiers], modifiers:
-    template <class... Args> void emplace_front(Args&&... args);
     void push_front(const T& x);
     void push_front(T&& x);
     void pop_front();
     template <class... Args> iterator emplace_after(const_iterator position, Args&&... args);
@@ -1415,17 +1769,18 @@ namespace std {
       iterator insert_after(const_iterator position, InputIterator first, InputIterator last);
     iterator insert_after(const_iterator position, initializer_list<T> il);
     iterator erase_after(const_iterator position);
     iterator erase_after(const_iterator position, const_iterator last);
-    void swap(forward_list&);
     void resize(size_type sz);
     void resize(size_type sz, const value_type& c);
     void clear() noexcept;
-    // [forwardlist.ops], forward_list operations:
     void splice_after(const_iterator position, forward_list& x);
     void splice_after(const_iterator position, forward_list&& x);
     void splice_after(const_iterator position, forward_list& x,
                       const_iterator i);
     void splice_after(const_iterator position, forward_list&& x,
@@ -1450,11 +1805,15 @@ namespace std {
     template <class Compare> void sort(Compare comp);
     void reverse() noexcept;
   };
- // Comparison operators
   template <class T, class Allocator>
     bool operator==(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
@@ -1464,16 +1823,23 @@ namespace std {
   template <class T, class Allocator>
     bool operator>=(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
-  // [forwardlist.spec], specialized algorithms:
   template <class T, class Allocator>
-    void swap(forward_list<T,Allocator>& x, forward_list<T,Allocator>& y);
 }
 ```
 #### `forward_list` constructors, copy, assignment <a id="forwardlist.cons">[[forwardlist.cons]]</a>
 ``` cpp
 explicit forward_list(const Allocator&);
 ```
@@ -1550,11 +1916,11 @@ elements into a `forward_list` is linear in `n`, and the number of calls
 to the copy or move constructor of `T` is exactly equal to `n`. Erasing
 `n` elements from a `forward_list` is linear in `n` and the number of
 calls to the destructor of type `T` is exactly equal to `n`.
 ``` cpp
-template <class... Args> void emplace_front(Args&&... args);
 ```
 *Effects:* Inserts an object of type `value_type` constructed with
 `value_type(std::forward<Args>(args)...)` at the beginning of the list.
@@ -1567,11 +1933,11 @@ void push_front(T&& x);
 ``` cpp
 void pop_front();
 ```
-*Effects:* `erase_after(before_begin())`
 ``` cpp
 iterator insert_after(const_iterator position, const T& x);
 iterator insert_after(const_iterator position, T&& x);
 ```
@@ -1674,14 +2040,12 @@ end of the list.
 void resize(size_type sz, const value_type& c);
 ```
 *Effects:* If `sz < distance(begin(), end())`, erases the last
 `distance(begin(), end()) - sz` elements from the list. Otherwise,
-inserts `sz - distance(begin(), end())` elements at the end of the list
-such that each new element, `e`, is initialized by a method equivalent
-to calling
-`allocator_traits<allocator_type>::construct(get_allocator(), std::addressof(e), c)`.
 *Requires:* `T` shall be `CopyInsertable` into `*this`.
 ``` cpp
 void clear() noexcept;
@@ -1708,11 +2072,11 @@ those same elements but as members of `*this`. Iterators referring to
 the moved elements will continue to refer to their elements, but they
 now behave as iterators into `*this`, not into `x`.
 *Throws:* Nothing.
-*Complexity:* 𝑂(distance(x.begin(), x.end()))
 ``` cpp
 void splice_after(const_iterator position, forward_list& x, const_iterator i);
 void splice_after(const_iterator position, forward_list&& x, const_iterator i);
 ```
@@ -1751,20 +2115,20 @@ dereferenceable. `position` is not an iterator in the range (`first`,
 the moved elements of `x` now refer to those same elements but as
 members of `*this`. Iterators referring to the moved elements will
 continue to refer to their elements, but they now behave as iterators
 into `*this`, not into `x`.
-*Complexity:* 𝑂(distance(first, last))
 ``` cpp
 void remove(const T& value);
 template <class Predicate> void remove_if(Predicate pred);
 ```
 *Effects:* Erases all the elements in the list referred by a list
 iterator `i` for which the following conditions hold: `*i == value` (for
-`remove()`), `pred(*i)` is true (for `remove_if()`). Invalidates only
 the iterators and references to the erased elements.
 *Throws:* Nothing unless an exception is thrown by the equality
 comparison or the predicate.
@@ -1810,11 +2174,11 @@ references to the moved elements of `x` now refer to those same elements
 but as members of `*this`. Iterators referring to the moved elements
 will continue to refer to their elements, but they now behave as
 iterators into `*this`, not into `x`.
 *Remarks:* Stable ([[algorithm.stable]]). The behavior is undefined if
-`this->get_allocator() != x.get_allocator()`.
 *Complexity:* At most
 `distance(begin(), end()) + distance(x.begin(), x.end()) - 1`
 comparisons.
@@ -1826,11 +2190,11 @@ template <class Compare> void sort(Compare comp);
 *Requires:* `operator<` (for the version with no arguments) or `comp`
 (for the version with a comparison argument) defines a strict weak
 ordering ([[alg.sorting]]).
 *Effects:* Sorts the list according to the `operator<` or the `comp`
-function object. If an exception is thrown the order of the elements in
 `*this` is unspecified. Does not affect the validity of iterators and
 references.
 *Remarks:* Stable ([[algorithm.stable]]).
@@ -1848,14 +2212,15 @@ affect the validity of iterators and references.
 #### `forward_list` specialized algorithms <a id="forwardlist.spec">[[forwardlist.spec]]</a>
 ``` cpp
 template <class T, class Allocator>
-  void swap(forward_list<T,Allocator>& x, forward_list<T,Allocator>& y);
 ```
-*Effects:* `x.swap(y)`
 ### Class template `list` <a id="list">[[list]]</a>
 #### Class template `list` overview <a id="list.overview">[[list.overview]]</a>
@@ -1881,24 +2246,24 @@ information.
 namespace std {
   template <class T, class Allocator = allocator<T>>
   class list {
   public:
     // types:
- typedef value_type&                                             reference;
- typedef const value_type&                                       const_reference;
- typedef implementation-defined iterator;       // see [container.requirements]
- typedef implementation-defined                const_iterator; // see [container.requirements]
- typedef implementation-defined                size_type;      // see [container.requirements]
- typedef implementation-defined                difference_type;// see [container.requirements]
- typedef T                                     value_type;
- typedef Allocator                             allocator_type;
- typedef typename allocator_traits<Allocator>::pointer           pointer;
- typedef typename allocator_traits<Allocator>::const_pointer     const_pointer;
- typedef std::reverse_iterator<iterator>       reverse_iterator;
- typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-    // [list.cons], construct/copy/destroy:
     list() : list(Allocator()) { }
     explicit list(const Allocator&);
     explicit list(size_type n, const Allocator& = Allocator());
     list(size_type n, const T& value, const Allocator& = Allocator());
     template <class InputIterator>
@@ -1908,11 +2273,12 @@ namespace std {
     list(const list&, const Allocator&);
     list(list&&, const Allocator&);
     list(initializer_list<T>, const Allocator& = Allocator());
     ~list();
     list& operator=(const list& x);
-    list& operator=(list&& x);
     list& operator=(initializer_list<T>);
     template <class InputIterator>
       void assign(InputIterator first, InputIterator last);
     void assign(size_type n, const T& t);
     void assign(initializer_list<T>);
@@ -1931,11 +2297,11 @@ namespace std {
     const_iterator         cbegin() const noexcept;
     const_iterator         cend() const noexcept;
     const_reverse_iterator crbegin() const noexcept;
     const_reverse_iterator crend() const noexcept;
-    // [list.capacity], capacity:
     bool      empty() const noexcept;
     size_type size() const noexcept;
     size_type max_size() const noexcept;
     void      resize(size_type sz);
     void      resize(size_type sz, const T& c);
@@ -1944,16 +2310,16 @@ namespace std {
     reference       front();
     const_reference front() const;
     reference       back();
     const_reference back() const;
-    // [list.modifiers], modifiers:
-    template <class... Args> void emplace_front(Args&&... args);
- void pop_front();
-    template <class... Args> void emplace_back(Args&&... args);
     void push_front(const T& x);
     void push_front(T&& x);
     void push_back(const T& x);
     void push_back(T&& x);
     void pop_back();
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);
@@ -1965,14 +2331,15 @@ namespace std {
                       InputIterator last);
     iterator insert(const_iterator position, initializer_list<T> il);
     iterator erase(const_iterator position);
     iterator erase(const_iterator position, const_iterator last);
-    void     swap(list&);
     void     clear() noexcept;
-    // [list.ops], list operations:
     void splice(const_iterator position, list& x);
     void splice(const_iterator position, list&& x);
     void splice(const_iterator position, list& x, const_iterator i);
     void splice(const_iterator position, list&& x, const_iterator i);
     void splice(const_iterator position, list& x,
@@ -1996,10 +2363,15 @@ namespace std {
     template <class Compare> void sort(Compare comp);
     void reverse() noexcept;
   };
   template <class T, class Allocator>
     bool operator==(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
@@ -2009,16 +2381,22 @@ namespace std {
   template <class T, class Allocator>
     bool operator>=(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const list<T, Allocator>& x, const list<T, Allocator>& y);
-  // specialized algorithms:
   template <class T, class Allocator>
-    void swap(list<T,Allocator>& x, list<T,Allocator>& y);
 }
 ```
 #### `list` constructors, copy, and assignment <a id="list.cons">[[list.cons]]</a>
 ``` cpp
 explicit list(const Allocator&);
 ```
@@ -2037,12 +2415,11 @@ the specified allocator.
 *Requires:* `T` shall be `DefaultInsertable` into `*this`.
 *Complexity:* Linear in `n`.
 ``` cpp
-list(size_type n, const T& value,
-     const Allocator& = Allocator());
 ```
 *Effects:* Constructs a `list` with `n` copies of `value`, using the
 specified allocator.
@@ -2050,12 +2427,11 @@ specified allocator.
 *Complexity:* Linear in `n`.
 ``` cpp
 template <class InputIterator>
-list(InputIterator first, InputIterator last,
-     const Allocator& = Allocator());
 ```
 *Effects:* Constructs a `list` equal to the range \[`first`, `last`).
 *Complexity:* Linear in `distance(first, last)`.
@@ -2065,11 +2441,11 @@ list(InputIterator first, InputIterator last,
 ``` cpp
 void resize(size_type sz);
 ```
 *Effects:* If `size() < sz`, appends `sz - size()` default-inserted
-elements to the sequence. If `sz <= size()`, equivalent to
 ``` cpp
 list<T>::iterator it = begin();
 advance(it, sz);
 erase(it, end());
@@ -2079,11 +2455,11 @@ erase(it, end());
 ``` cpp
 void resize(size_type sz, const T& c);
 ```
-*Effects:*
 ``` cpp
 if (sz > size())
   insert(end(), sz-size(), c);
 else if (sz < size()) {
@@ -2106,12 +2482,12 @@ iterator insert(const_iterator position, size_type n, const T& x);
 template <class InputIterator>
   iterator insert(const_iterator position, InputIterator first,
                   InputIterator last);
 iterator insert(const_iterator position, initializer_list<T>);
-template <class... Args> void emplace_front(Args&&... args);
-template <class... Args> void emplace_back(Args&&... args);
 template <class... Args> iterator emplace(const_iterator position, Args&&... args);
 void push_front(const T& x);
 void push_front(T&& x);
 void push_back(const T& x);
 void push_back(T&& x);
@@ -2175,19 +2551,19 @@ now behave as iterators into `*this`, not into `x`.
 ``` cpp
 void splice(const_iterator position, list& x, const_iterator i);
 void splice(const_iterator position, list&& x, const_iterator i);
 ```
 *Effects:* Inserts an element pointed to by `i` from list `x` before
 `position` and removes the element from `x`. The result is unchanged if
 `position == i` or `position == ++i`. Pointers and references to `*i`
 continue to refer to this same element but as a member of `*this`.
 Iterators to `*i` (including `i` itself) continue to refer to the same
 element, but now behave as iterators into `*this`, not into `x`.
-*Requires:* `i` is a valid dereferenceable iterator of `x`.
 *Throws:* Nothing.
 *Complexity:* Constant time.
 ``` cpp
@@ -2195,19 +2571,20 @@ void splice(const_iterator position, list& x, const_iterator first,
             const_iterator last);
 void splice(const_iterator position, list&& x, const_iterator first,
             const_iterator last);
 ```
 *Effects:* Inserts elements in the range \[`first`, `last`) before
-`position` and removes the elements from `x`.
-*Requires:* `[first, last)` is a valid range in `x`. The result is
-undefined if `position` is an iterator in the range \[`first`, `last`).
-Pointers and references to the moved elements of `x` now refer to those
-same elements but as members of `*this`. Iterators referring to the
-moved elements will continue to refer to their elements, but they now
-behave as iterators into `*this`, not into `x`.
 *Throws:* Nothing.
 *Complexity:* Constant time if `&x == this`; otherwise, linear time.
@@ -2262,20 +2639,20 @@ shall be sorted according to this ordering.
 *Effects:* If `(&x == this)` does nothing; otherwise, merges the two
 sorted ranges `[begin(), end())` and `[x.begin(), x.end())`. The result
 is a range in which the elements will be sorted in non-decreasing order
 according to the ordering defined by `comp`; that is, for every iterator
 `i`, in the range other than the first, the condition
-`comp(*i, *(i - 1))` will be false. Pointers and references to the moved
-elements of `x` now refer to those same elements but as members of
 `*this`. Iterators referring to the moved elements will continue to
 refer to their elements, but they now behave as iterators into `*this`,
 not into `x`.
 *Remarks:* Stable ([[algorithm.stable]]). If `(&x != this)` the range
 `[x.begin(), x.end())` is empty after the merge. No elements are copied
 by this operation. The behavior is undefined if
-`this->get_allocator() != x.get_allocator()`.
 *Complexity:* At most `size() + x.size() - 1` applications of `comp` if
 `(&x != this)`; otherwise, no applications of `comp` are performed. If
 an exception is thrown other than by a comparison there are no effects.
@@ -2295,89 +2672,85 @@ template <class Compare> void sort(Compare comp);
 *Requires:* `operator<` (for the first version) or `comp` (for the
 second version) shall define a strict weak ordering ([[alg.sorting]]).
 *Effects:* Sorts the list according to the `operator<` or a `Compare`
-function object. Does not affect the validity of iterators and
 references.
 *Remarks:* Stable ([[algorithm.stable]]).
-*Complexity:* Approximately N log(N) comparisons, where `N == size()`.
 #### `list` specialized algorithms <a id="list.special">[[list.special]]</a>
 ``` cpp
 template <class T, class Allocator>
-  void swap(list<T,Allocator>& x, list<T,Allocator>& y);
 ```
-*Effects:*
-``` cpp
-x.swap(y);
-```
 ### Class template `vector` <a id="vector">[[vector]]</a>
 #### Class template `vector` overview <a id="vector.overview">[[vector.overview]]</a>
-A `vector` is a sequence container that supports random access
-iterators. In addition, it supports (amortized) constant time insert and
-erase operations at the end; insert and erase in the middle take linear
-time. Storage management is handled automatically, though hints can be
-given to improve efficiency. The elements of a vector are stored
-contiguously, meaning that if `v` is a `vector<T, Allocator>` where `T`
-is some type other than `bool`, then it obeys the identity
-`&v[n] == &v[0] + n` for all `0 <= n < v.size()`.
 A `vector` satisfies all of the requirements of a container and of a
 reversible container (given in two tables in
 [[container.requirements]]), of a sequence container, including most of
-the optional sequence container requirements ([[sequence.reqmts]]), and
-of an allocator-aware container (Table
-[[tab:containers.allocatoraware]]). The exceptions are the `push_front`,
-`pop_front`, and `emplace_front` member functions, which are not
-provided. Descriptions are provided here only for operations on `vector`
-that are not described in one of these tables or for operations where
-there is additional semantic information.
 ``` cpp
 namespace std {
   template <class T, class Allocator = allocator<T>>
   class vector {
   public:
     // types:
- typedef value_type&                           reference;
- typedef const value_type&                     const_reference;
- typedef implementation-defined iterator;       // see [container.requirements]
- typedef implementation-defined                const_iterator; // see [container.requirements]
- typedef implementation-defined                size_type;      // see [container.requirements]
- typedef implementation-defined                difference_type;// see [container.requirements]
- typedef T                                     value_type;
- typedef Allocator                             allocator_type;
- typedef typename allocator_traits<Allocator>::pointer           pointer;
- typedef typename allocator_traits<Allocator>::const_pointer     const_pointer;
- typedef std::reverse_iterator<iterator>       reverse_iterator;
- typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-    // [vector.cons], construct/copy/destroy:
-    vector() : vector(Allocator()) { }
-    explicit vector(const Allocator&);
     explicit vector(size_type n, const Allocator& = Allocator());
     vector(size_type n, const T& value, const Allocator& = Allocator());
     template <class InputIterator>
-      vector(InputIterator first, InputIterator last,
-             const Allocator& = Allocator());
     vector(const vector& x);
-    vector(vector&&);
     vector(const vector&, const Allocator&);
     vector(vector&&, const Allocator&);
     vector(initializer_list<T>, const Allocator& = Allocator());
     ~vector();
     vector& operator=(const vector& x);
-    vector& operator=(vector&& x);
     vector& operator=(initializer_list<T>);
     template <class InputIterator>
       void assign(InputIterator first, InputIterator last);
     void assign(size_type n, const T& u);
     void assign(initializer_list<T>);
@@ -2396,17 +2769,17 @@ namespace std {
     const_iterator         cbegin() const noexcept;
     const_iterator         cend() const noexcept;
     const_reverse_iterator crbegin() const noexcept;
     const_reverse_iterator crend() const noexcept;
-    // [vector.capacity], capacity:
     size_type size() const noexcept;
     size_type max_size() const noexcept;
     void      resize(size_type sz);
     void      resize(size_type sz, const T& c);
-    size_type capacity() const noexcept;
-    bool      empty() const noexcept;
     void      reserve(size_type n);
     void      shrink_to_fit();
     // element access:
     reference       operator[](size_type n);
@@ -2420,30 +2793,36 @@ namespace std {
     // [vector.data], data access
     T*       data() noexcept;
     const T* data() const noexcept;
-    // [vector.modifiers], modifiers:
-    template <class... Args> void emplace_back(Args&&... args);
     void push_back(const T& x);
     void push_back(T&& x);
     void pop_back();
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);
     iterator insert(const_iterator position, const T& x);
     iterator insert(const_iterator position, T&& x);
     iterator insert(const_iterator position, size_type n, const T& x);
     template <class InputIterator>
- iterator insert(const_iterator position,
-                        InputIterator first, InputIterator last);
     iterator insert(const_iterator position, initializer_list<T> il);
     iterator erase(const_iterator position);
     iterator erase(const_iterator first, const_iterator last);
-    void     swap(vector&);
     void     clear() noexcept;
   };
   template <class T, class Allocator>
     bool operator==(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
@@ -2453,16 +2832,22 @@ namespace std {
   template <class T, class Allocator>
     bool operator>=(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
-  // [vector.special], specialized algorithms:
   template <class T, class Allocator>
-    void swap(vector<T,Allocator>& x, vector<T,Allocator>& y);
 }
 ```
 #### `vector` constructors, copy, and assignment <a id="vector.cons">[[vector.cons]]</a>
 ``` cpp
 explicit vector(const Allocator&);
 ```
@@ -2503,13 +2888,13 @@ template <class InputIterator>
 *Effects:* Constructs a `vector` equal to the range \[`first`, `last`),
 using the specified allocator.
 *Complexity:* Makes only N calls to the copy constructor of `T` (where N
 is the distance between `first` and `last`) and no reallocations if
-iterators first and last are of forward, bidirectional, or random access
-categories. It makes order `N` calls to the copy constructor of `T` and
-order log(N) reallocations if they are just input iterators.
 #### `vector` capacity <a id="vector.capacity">[[vector.capacity]]</a>
 ``` cpp
 size_type capacity() const noexcept;
@@ -2548,20 +2933,30 @@ vector greater than the value of `capacity()`.
 void shrink_to_fit();
 ```
 *Requires:* `T` shall be `MoveInsertable` into `*this`.
 *Complexity:* Linear in the size of the sequence.
-*Remarks:* `shrink_to_fit` is a non-binding request to reduce
-`capacity()` to `size()`. The request is non-binding to allow latitude
-for implementation-specific optimizations. If an exception is thrown
-other than by the move constructor of a non-`CopyInsertable` `T` there
-are no effects.
 ``` cpp
-void swap(vector& x);
 ```
 *Effects:* Exchanges the contents and `capacity()` of `*this` with that
 of `x`.
@@ -2569,13 +2964,13 @@ of `x`.
 ``` cpp
 void resize(size_type sz);
 ```
-*Effects:* If `sz <= size()`, equivalent to calling `pop_back()`
-`size() - sz` times. If `size() < sz`, appends `sz - size()`
-default-inserted elements to the sequence.
 *Requires:* `T` shall be `MoveInsertable` and `DefaultInsertable` into
 `*this`.
 *Remarks:* If an exception is thrown other than by the move constructor
@@ -2583,13 +2978,13 @@ of a non-`CopyInsertable` `T` there are no effects.
 ``` cpp
 void resize(size_type sz, const T& c);
 ```
-*Effects:* If `sz <= size()`, equivalent to calling `pop_back()`
-`size() - sz` times. If `size() < sz`, appends `sz - size()` copies of
-`c` to the sequence.
 *Requires:* `T` shall be `CopyInsertable` into `*this`.
 *Remarks:* If an exception is thrown there are no effects.
@@ -2599,11 +2994,11 @@ void resize(size_type sz, const T& c);
 T*         data() noexcept;
 const T*   data() const noexcept;
 ```
 *Returns:* A pointer such that \[`data()`, `data() + size()`) is a valid
-range. For a non-empty vector, `data()` `==` `&front()`.
 *Complexity:* Constant time.
 #### `vector` modifiers <a id="vector.modifiers">[[vector.modifiers]]</a>
@@ -2613,81 +3008,81 @@ iterator insert(const_iterator position, T&& x);
 iterator insert(const_iterator position, size_type n, const T& x);
 template <class InputIterator>
   iterator insert(const_iterator position, InputIterator first, InputIterator last);
 iterator insert(const_iterator position, initializer_list<T>);
-template <class... Args> void emplace_back(Args&&... args);
 template <class... Args> iterator emplace(const_iterator position, Args&&... args);
 void push_back(const T& x);
 void push_back(T&& x);
 ```
 *Remarks:* Causes reallocation if the new size is greater than the old
-capacity. If no reallocation happens, all the iterators and references
-before the insertion point remain valid. If an exception is thrown other
-than by the copy constructor, move constructor, assignment operator, or
-move assignment operator of `T` or by any `InputIterator` operation
-there are no effects. If an exception is thrown while inserting a single
-element at the end and `T` is `CopyInsertable` or
-`is_nothrow_move_constructible<T>::value` is `true`, there are no
-effects. Otherwise, if an exception is thrown by the move constructor of
-a non-`CopyInsertable` `T`, the effects are unspecified.
 *Complexity:* The complexity is linear in the number of elements
 inserted plus the distance to the end of the vector.
 ``` cpp
 iterator erase(const_iterator position);
 iterator erase(const_iterator first, const_iterator last);
 ```
 *Effects:* Invalidates iterators and references at or after the point of
 the erase.
 *Complexity:* The destructor of `T` is called the number of times equal
-to the number of the elements erased, but the move assignment operator
-of `T` is called the number of times equal to the number of elements in
-the vector after the erased elements.
-*Throws:* Nothing unless an exception is thrown by the copy constructor,
-move constructor, assignment operator, or move assignment operator of
-`T`.
 #### `vector` specialized algorithms <a id="vector.special">[[vector.special]]</a>
 ``` cpp
 template <class T, class Allocator>
-  void swap(vector<T,Allocator>& x, vector<T,Allocator>& y);
 ```
-*Effects:*
-``` cpp
-x.swap(y);
-```
 ### Class `vector<bool>` <a id="vector.bool">[[vector.bool]]</a>
 To optimize space allocation, a specialization of vector for `bool`
 elements is provided:
 ``` cpp
 namespace std {
-  template <class Allocator> class vector<bool, Allocator> {
   public:
     // types:
- typedef bool                                  const_reference;
- typedef implementation-defined                iterator;       // see [container.requirements]
- typedef implementation-defined                const_iterator; // see [container.requirements]
- typedef implementation-defined                size_type;      // see [container.requirements]
- typedef implementation-defined                difference_type;// see [container.requirements]
- typedef bool                                  value_type;
- typedef Allocator                             allocator_type;
- typedef implementation-defined                pointer;
- typedef implementation-defined                const_pointer;
- typedef std::reverse_iterator<iterator>       reverse_iterator;
- typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
     // bit reference:
     class reference {
       friend class vector;
       reference() noexcept;
@@ -2737,15 +3132,15 @@ namespace std {
     const_iterator         cend() const noexcept;
     const_reverse_iterator crbegin() const noexcept;
     const_reverse_iterator crend() const noexcept;
     // capacity:
     size_type size() const noexcept;
     size_type max_size() const noexcept;
     void      resize(size_type sz, bool c = false);
-    size_type capacity() const noexcept;
-    bool      empty() const noexcept;
     void      reserve(size_type n);
     void      shrink_to_fit();
     // element access:
     reference       operator[](size_type n);
@@ -2756,11 +3151,11 @@ namespace std {
     const_reference front() const;
     reference       back();
     const_reference back() const;
     // modifiers:
-    template <class... Args> void emplace_back(Args&&... args);
     void push_back(const bool& x);
     void pop_back();
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);
     iterator insert(const_iterator position, const bool& x);
     iterator insert(const_iterator position, size_type n, const bool& x);
@@ -2780,21 +3175,21 @@ namespace std {
 ```
 Unless described below, all operations have the same requirements and
 semantics as the primary `vector` template, except that operations
 dealing with the `bool` value type map to bit values in the container
-storage and allocator_traits::construct ([[allocator.traits.members]])
-is not used to construct these values.
 There is no requirement that the data be stored as a contiguous
 allocation of `bool` values. A space-optimized representation of bits is
 recommended instead.
 `reference`
 is a class that simulates the behavior of references of a single bit in
-`vector<bool>`. The conversion operator returns `true` when the bit is
 set, and `false` otherwise. The assignment operator sets the bit when
 the argument is (convertible to) `true` and clears it otherwise. `flip`
 reverses the state of the bit.
 ``` cpp
@@ -2805,11 +3200,11 @@ void flip() noexcept;
 ``` cpp
 static void swap(reference x, reference y) noexcept;
 ```
-*Effects:* exchanges the contents of `x` and `y` as if by
 ``` cpp
 bool b = x;
 x = y;
 y = b;
@@ -2817,27 +3212,42 @@ y = b;
 ``` cpp
 template <class Allocator> struct hash<vector<bool, Allocator>>;
 ```
-The template specialization shall meet the requirements of class
-template `hash` ([[unord.hash]]).
 ## Associative containers <a id="associative">[[associative]]</a>
 ### In general <a id="associative.general">[[associative.general]]</a>
 The header `<map>` defines the class templates `map` and `multimap`; the
 header `<set>` defines the class templates `set` and `multiset`.
 ### Header `<map>` synopsis <a id="associative.map.syn">[[associative.map.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
   template <class Key, class T, class Compare = less<Key>,
             class Allocator = allocator<pair<const Key, T>>>
     class map;
   template <class Key, class T, class Compare, class Allocator>
     bool operator==(const map<Key, T, Compare, Allocator>& x,
@@ -2857,12 +3267,14 @@ namespace std {
   template <class Key, class T, class Compare, class Allocator>
     bool operator<=(const map<Key, T, Compare, Allocator>& x,
                     const map<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     void swap(map<Key, T, Compare, Allocator>& x,
-              map<Key,T,Compare,Allocator>& y);
   template <class Key, class T, class Compare = less<Key>,
             class Allocator = allocator<pair<const Key, T>>>
     class multimap;
   template <class Key, class T, class Compare, class Allocator>
     bool operator==(const multimap<Key, T, Compare, Allocator>& x,
@@ -2882,21 +3294,32 @@ namespace std {
   template <class Key, class T, class Compare, class Allocator>
     bool operator<=(const multimap<Key, T, Compare, Allocator>& x,
                     const multimap<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     void swap(multimap<Key, T, Compare, Allocator>& x,
-              multimap<Key,T,Compare,Allocator>& y);
 }
 ```
 ### Header `<set>` synopsis <a id="associative.set.syn">[[associative.set.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
   template <class Key, class Compare = less<Key>,
             class Allocator = allocator<Key>>
     class set;
   template <class Key, class Compare, class Allocator>
     bool operator==(const set<Key, Compare, Allocator>& x,
@@ -2916,12 +3339,14 @@ namespace std {
   template <class Key, class Compare, class Allocator>
     bool operator<=(const set<Key, Compare, Allocator>& x,
                     const set<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     void swap(set<Key, Compare, Allocator>& x,
-              set<Key,Compare,Allocator>& y);
   template <class Key, class Compare = less<Key>,
             class Allocator = allocator<Key>>
     class multiset;
   template <class Key, class Compare, class Allocator>
     bool operator==(const multiset<Key, Compare, Allocator>& x,
@@ -2941,11 +3366,22 @@ namespace std {
   template <class Key, class Compare, class Allocator>
     bool operator<=(const multiset<Key, Compare, Allocator>& x,
                     const multiset<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     void swap(multiset<Key, Compare, Allocator>& x,
-              multiset<Key,Compare,Allocator>& y);
 }
 ```
 ### Class template `map` <a id="map">[[map]]</a>
@@ -2958,59 +3394,57 @@ bidirectional iterators.
 A `map` satisfies all of the requirements of a container, of a
 reversible container ([[container.requirements]]), of an associative
 container ([[associative.reqmts]]), and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). A `map` also provides most
-operations described in ([[associative.reqmts]]) for unique keys. This
-means that a `map` supports the `a_uniq` operations in (
-[[associative.reqmts]]) but not the `a_eq` operations. For a
-`map<Key,T>` the `key_type` is `Key` and the `value_type` is
-`pair<const Key,T>`. Descriptions are provided here only for operations
-on `map` that are not described in one of those tables or for operations
-where there is additional semantic information.
 ``` cpp
 namespace std {
   template <class Key, class T, class Compare = less<Key>,
             class Allocator = allocator<pair<const Key, T>>>
   class map {
   public:
     // types:
- typedef Key                                   key_type;
- typedef T                                     mapped_type;
- typedef pair<const Key, T>                    value_type;
- typedef Compare                               key_compare;
- typedef Allocator                             allocator_type;
- typedef value_type&                           reference;
- typedef const value_type&                     const_reference;
- typedef implementation-defined                iterator;       // see [container.requirements]
- typedef implementation-defined                const_iterator; // see [container.requirements]
- typedef implementation-defined                size_type; // see [container.requirements]
- typedef implementation-defined                difference_type;// see [container.requirements]
- typedef typename allocator_traits<Allocator>::pointer           pointer;
- typedef typename allocator_traits<Allocator>::const_pointer     const_pointer;
- typedef std::reverse_iterator<iterator>       reverse_iterator;
- typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
     class value_compare {
       friend class map;
     protected:
       Compare comp;
       value_compare(Compare c) : comp(c) {}
     public:
-      typedef bool result_type;
-      typedef value_type first_argument_type;
-      typedef value_type second_argument_type;
       bool operator()(const value_type& x, const value_type& y) const {
         return comp(x.first, y.first);
       }
     };
-    // [map.cons], construct/copy/destroy:
     map() : map(Compare()) { }
-    explicit map(const Compare& comp,
-                 const Allocator& = Allocator());
     template <class InputIterator>
       map(InputIterator first, InputIterator last,
           const Compare& comp = Compare(), const Allocator& = Allocator());
     map(const map& x);
     map(map&& x);
@@ -3025,11 +3459,13 @@ namespace std {
         : map(first, last, Compare(), a) { }
     map(initializer_list<value_type> il, const Allocator& a)
       : map(il, Compare(), a) { }
     ~map();
     map& operator=(const map& x);
-    map& operator=(map&& x);
     map& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
     // iterators:
     iterator               begin() noexcept;
@@ -3050,34 +3486,70 @@ namespace std {
     // capacity:
     bool      empty() const noexcept;
     size_type size() const noexcept;
     size_type max_size() const noexcept;
-    // [map.access], element access:
     T& operator[](const key_type& x);
     T& operator[](key_type&& x);
     T&       at(const key_type& x);
     const T& at(const key_type& x) const;
-    // [map.modifiers], modifiers:
     template <class... Args> pair<iterator, bool> emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     pair<iterator, bool> insert(const value_type& x);
     template <class P> pair<iterator, bool> insert(P&& x);
     iterator insert(const_iterator position, const value_type& x);
     template <class P>
       iterator insert(const_iterator position, P&&);
     template <class InputIterator>
       void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& x);
     iterator  erase(const_iterator first, const_iterator last);
-    void swap(map&);
     void      clear() noexcept;
     // observers:
     key_compare key_comp() const;
     value_compare value_comp() const;
     // map operations:
@@ -3097,20 +3569,36 @@ namespace std {
     iterator       upper_bound(const key_type& x);
     const_iterator upper_bound(const key_type& x) const;
     template <class K> iterator       upper_bound(const K& x);
     template <class K> const_iterator upper_bound(const K& x) const;
-    pair<iterator,iterator>
- equal_range(const key_type& x);
-    pair<const_iterator,const_iterator>
-      equal_range(const key_type& x) const;
     template <class K>
       pair<iterator, iterator>             equal_range(const K& x);
     template <class K>
       pair<const_iterator, const_iterator> equal_range(const K& x) const;
   };
   template <class Key, class T, class Compare, class Allocator>
     bool operator==(const map<Key, T, Compare, Allocator>& x,
                     const map<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     bool operator< (const map<Key, T, Compare, Allocator>& x,
@@ -3126,22 +3614,22 @@ namespace std {
                     const map<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     bool operator<=(const map<Key, T, Compare, Allocator>& x,
                     const map<Key, T, Compare, Allocator>& y);
-  // specialized algorithms:
   template <class Key, class T, class Compare, class Allocator>
     void swap(map<Key, T, Compare, Allocator>& x,
-              map<Key,T,Compare,Allocator>& y);
 }
 ```
 #### `map` constructors, copy, and assignment <a id="map.cons">[[map.cons]]</a>
 ``` cpp
-explicit map(const Compare& comp,
-             const Allocator& = Allocator());
 ```
 *Effects:* Constructs an empty `map` using the specified comparison
 object and allocator.
@@ -3151,51 +3639,30 @@ object and allocator.
 template <class InputIterator>
   map(InputIterator first, InputIterator last,
       const Compare& comp = Compare(), const Allocator& = Allocator());
 ```
-*Requires:* If the iterator’s indirection operator returns an lvalue or
-a const rvalue `pair<key_type, mapped_type>`, then both `key_type` and
-`mapped_type` shall be `CopyInsertable` into `*this`.
 *Effects:* Constructs an empty `map` using the specified comparison
 object and allocator, and inserts elements from the range \[`first`,
 `last`).
 *Complexity:* Linear in N if the range \[`first`, `last`) is already
-sorted using `comp` and otherwise N log N, where N is `last` - `first`.
 #### `map` element access <a id="map.access">[[map.access]]</a>
 ``` cpp
 T& operator[](const key_type& x);
 ```
-*Effects:* If there is no key equivalent to `x` in the map, inserts
-`value_type(x, T())` into the map.
-*Requires:* `key_type` shall be `CopyInsertable` and `mapped_type` shall
-be `DefaultInsertable` into `*this`.
-*Returns:* A reference to the `mapped_type` corresponding to `x` in
-`*this`.
-*Complexity:* Logarithmic.
 ``` cpp
 T& operator[](key_type&& x);
 ```
-*Effects:* If there is no key equivalent to `x` in the map, inserts
-`value_type(std::move(x), T())` into the map.
-*Requires:* `mapped_type` shall be `DefaultInsertable` into `*this`.
-*Returns:* A reference to the `mapped_type` corresponding to `x` in
-`*this`.
-*Complexity:* Logarithmic.
 ``` cpp
 T&       at(const key_type& x);
 const T& at(const key_type& x) const;
 ```
@@ -3209,36 +3676,122 @@ is present.
 *Complexity:* Logarithmic.
 #### `map` modifiers <a id="map.modifiers">[[map.modifiers]]</a>
 ``` cpp
-template <class P> pair<iterator, bool> insert(P&& x);
-template <class P> iterator insert(const_iterator position, P&& x);
-template <class InputIterator>
- void insert(InputIterator first, InputIterator last);
 ```
 *Effects:* The first form is equivalent to
 `return emplace(std::forward<P>(x))`. The second form is equivalent to
 `return emplace_hint(position, std::forward<P>(x))`.
 *Remarks:* These signatures shall not participate in overload resolution
-unless `std::is_constructible<value_type, P&&>::value` is `true`.
 #### `map` specialized algorithms <a id="map.special">[[map.special]]</a>
 ``` cpp
 template <class Key, class T, class Compare, class Allocator>
   void swap(map<Key, T, Compare, Allocator>& x,
-            map<Key,T,Compare,Allocator>& y);
 ```
-*Effects:*
-``` cpp
-x.swap(y);
-```
 ### Class template `multimap` <a id="multimap">[[multimap]]</a>
 #### Class template `multimap` overview <a id="multimap.overview">[[multimap.overview]]</a>
@@ -3249,13 +3802,13 @@ for fast retrieval of values of another type `T` based on the keys. The
 A `multimap` satisfies all of the requirements of a container and of a
 reversible container ([[container.requirements]]), of an associative
 container ([[associative.reqmts]]), and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). A `multimap` also provides
-most operations described in ([[associative.reqmts]]) for equal keys.
-This means that a `multimap` supports the `a_eq` operations in (
-[[associative.reqmts]]) but not the `a_uniq` operations. For a
 `multimap<Key,T>` the `key_type` is `Key` and the `value_type` is
 `pair<const Key,T>`. Descriptions are provided here only for operations
 on `multimap` that are not described in one of those tables or for
 operations where there is additional semantic information.
@@ -3264,44 +3817,41 @@ namespace std {
   template <class Key, class T, class Compare = less<Key>,
             class Allocator = allocator<pair<const Key, T>>>
   class multimap {
   public:
     // types:
- typedef Key                                   key_type;
- typedef T                                     mapped_type;
- typedef pair<const Key,T>                     value_type;
- typedef Compare                               key_compare;
- typedef Allocator                             allocator_type;
- typedef value_type&                           reference;
- typedef const value_type&                     const_reference;
- typedef implementation-defined                iterator;       // see [container.requirements]
- typedef implementation-defined                const_iterator; // see [container.requirements]
- typedef implementation-defined                size_type; // see [container.requirements]
- typedef implementation-defined                difference_type;// see [container.requirements]
- typedef typename allocator_traits<Allocator>::pointer           pointer;
- typedef typename allocator_traits<Allocator>::const_pointer     const_pointer;
- typedef std::reverse_iterator<iterator>       reverse_iterator;
- typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
     class value_compare {
       friend class multimap;
     protected:
       Compare comp;
       value_compare(Compare c) : comp(c) { }
     public:
-      typedef bool result_type;
-      typedef value_type first_argument_type;
-      typedef value_type second_argument_type;
       bool operator()(const value_type& x, const value_type& y) const {
         return comp(x.first, y.first);
       }
     };
-    // construct/copy/destroy:
     multimap() : multimap(Compare()) { }
-    explicit multimap(const Compare& comp,
-                      const Allocator& = Allocator());
     template <class InputIterator>
       multimap(InputIterator first, InputIterator last,
                const Compare& comp = Compare(),
                const Allocator& = Allocator());
     multimap(const multimap& x);
@@ -3317,11 +3867,13 @@ namespace std {
         : multimap(first, last, Compare(), a) { }
     multimap(initializer_list<value_type> il, const Allocator& a)
       : multimap(il, Compare(), a) { }
     ~multimap();
     multimap& operator=(const multimap& x);
-    multimap& operator=(multimap&& x);
     multimap& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
     // iterators:
     iterator               begin() noexcept;
@@ -3342,27 +3894,46 @@ namespace std {
     // capacity:
     bool      empty() const noexcept;
     size_type size() const noexcept;
     size_type max_size() const noexcept;
-    // modifiers:
     template <class... Args> iterator emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     iterator insert(const value_type& x);
     template <class P> iterator insert(P&& x);
     iterator insert(const_iterator position, const value_type& x);
     template <class P> iterator insert(const_iterator position, P&& x);
     template <class InputIterator>
       void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& x);
     iterator  erase(const_iterator first, const_iterator last);
-    void swap(multimap&);
     void      clear() noexcept;
     // observers:
     key_compare key_comp() const;
     value_compare value_comp() const;
     // map operations:
@@ -3382,20 +3953,37 @@ namespace std {
     iterator       upper_bound(const key_type& x);
     const_iterator upper_bound(const key_type& x) const;
     template <class K> iterator       upper_bound(const K& x);
     template <class K> const_iterator upper_bound(const K& x) const;
-    pair<iterator,iterator>
- equal_range(const key_type& x);
-    pair<const_iterator,const_iterator>
-      equal_range(const key_type& x) const;
     template <class K>
       pair<iterator, iterator>             equal_range(const K& x);
     template <class K>
       pair<const_iterator, const_iterator> equal_range(const K& x) const;
   };
   template <class Key, class T, class Compare, class Allocator>
     bool operator==(const multimap<Key, T, Compare, Allocator>& x,
                     const multimap<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     bool operator< (const multimap<Key, T, Compare, Allocator>& x,
@@ -3411,22 +3999,22 @@ namespace std {
                     const multimap<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     bool operator<=(const multimap<Key, T, Compare, Allocator>& x,
                     const multimap<Key, T, Compare, Allocator>& y);
-  // specialized algorithms:
   template <class Key, class T, class Compare, class Allocator>
     void swap(multimap<Key, T, Compare, Allocator>& x,
-              multimap<Key,T,Compare,Allocator>& y);
 }
 ```
 #### `multimap` constructors <a id="multimap.cons">[[multimap.cons]]</a>
 ``` cpp
-explicit multimap(const Compare& comp,
-                  const Allocator& = Allocator());
 ```
 *Effects:* Constructs an empty `multimap` using the specified comparison
 object and allocator.
@@ -3437,14 +4025,10 @@ template <class InputIterator>
   multimap(InputIterator first, InputIterator last,
            const Compare& comp = Compare(),
            const Allocator& = Allocator());
 ```
-*Requires:* If the iterator’s indirection operator returns an lvalue or
-a const rvalue `pair<key_type, mapped_type>`, then both `key_type` and
-`mapped_type` shall be `CopyInsertable` into `*this`.
 *Effects:* Constructs an empty `multimap` using the specified comparison
 object and allocator, and inserts elements from the range \[`first`,
 `last`).
 *Complexity:* Linear in N if the range \[`first`, `last`) is already
@@ -3460,25 +4044,22 @@ template <class P> iterator insert(const_iterator position, P&& x);
 *Effects:* The first form is equivalent to
 `return emplace(std::forward<P>(x))`. The second form is equivalent to
 `return emplace_hint(position, std::forward<P>(x))`.
 *Remarks:* These signatures shall not participate in overload resolution
-unless `std::is_constructible<value_type, P&&>::value` is `true`.
 #### `multimap` specialized algorithms <a id="multimap.special">[[multimap.special]]</a>
 ``` cpp
 template <class Key, class T, class Compare, class Allocator>
   void swap(multimap<Key, T, Compare, Allocator>& x,
-            multimap<Key,T,Compare,Allocator>& y);
 ```
-*Effects:*
-``` cpp
-x.swap(y);
-```
 ### Class template `set` <a id="set">[[set]]</a>
 #### Class template `set` overview <a id="set.overview">[[set.overview]]</a>
@@ -3488,13 +4069,13 @@ keys themselves. The `set` class supports bidirectional iterators.
 A `set` satisfies all of the requirements of a container, of a
 reversible container ([[container.requirements]]), of an associative
 container ([[associative.reqmts]]), and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). A `set` also provides most
-operations described in ([[associative.reqmts]]) for unique keys. This
-means that a `set` supports the `a_uniq` operations in (
-[[associative.reqmts]]) but not the `a_eq` operations. For a `set<Key>`
 both the `key_type` and `value_type` are `Key`. Descriptions are
 provided here only for operations on `set` that are not described in one
 of these tables and for operations where there is additional semantic
 information.
@@ -3503,49 +4084,51 @@ namespace std {
   template <class Key, class Compare = less<Key>,
             class Allocator = allocator<Key>>
   class set {
   public:
     // types:
- typedef Key                                   key_type;
- typedef Key                                   value_type;
- typedef Compare                               key_compare;
- typedef Compare                               value_compare;
- typedef Allocator                             allocator_type;
- typedef value_type&                           reference;
- typedef const value_type&                     const_reference;
- typedef implementation-defined                iterator;       // See [container.requirements]
- typedef implementation-defined                const_iterator; // See [container.requirements]
- typedef implementation-defined                size_type; // See [container.requirements]
- typedef implementation-defined                difference_type;// See [container.requirements]
- typedef typename allocator_traits<Allocator>::pointer           pointer;
- typedef typename allocator_traits<Allocator>::const_pointer     const_pointer;
- typedef std::reverse_iterator<iterator>       reverse_iterator;
- typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-    // [set.cons], construct/copy/destroy:
     set() : set(Compare()) { }
-    explicit set(const Compare& comp,
-                 const Allocator& = Allocator());
     template <class InputIterator>
       set(InputIterator first, InputIterator last,
           const Compare& comp = Compare(), const Allocator& = Allocator());
     set(const set& x);
     set(set&& x);
     explicit set(const Allocator&);
     set(const set&, const Allocator&);
     set(set&&, const Allocator&);
-    set(initializer_list<value_type>,
-      const Compare& = Compare(),
         const Allocator& = Allocator());
     template <class InputIterator>
       set(InputIterator first, InputIterator last, const Allocator& a)
         : set(first, last, Compare(), a) { }
     set(initializer_list<value_type> il, const Allocator& a)
       : set(il, Compare(), a) { }
     ~set();
     set& operator=(const set& x);
-    set& operator=(set&& x);
     set& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
     // iterators:
     iterator               begin() noexcept;
@@ -3577,16 +4160,33 @@ namespace std {
     iterator insert(const_iterator position, value_type&& x);
     template <class InputIterator>
       void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& x);
     iterator  erase(const_iterator first, const_iterator last);
-    void swap(set&);
     void      clear() noexcept;
     // observers:
     key_compare key_comp() const;
     value_compare value_comp() const;
     // set operations:
@@ -3614,10 +4214,29 @@ namespace std {
       pair<iterator, iterator>             equal_range(const K& x);
     template <class K>
       pair<const_iterator, const_iterator> equal_range(const K& x) const;
   };
   template <class Key, class Compare, class Allocator>
     bool operator==(const set<Key, Compare, Allocator>& x,
                     const set<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     bool operator< (const set<Key, Compare, Allocator>& x,
@@ -3633,25 +4252,25 @@ namespace std {
                     const set<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     bool operator<=(const set<Key, Compare, Allocator>& x,
                     const set<Key, Compare, Allocator>& y);
-  // specialized algorithms:
   template <class Key, class Compare, class Allocator>
     void swap(set<Key, Compare, Allocator>& x,
-              set<Key,Compare,Allocator>& y);
 }
 ```
 #### `set` constructors, copy, and assignment <a id="set.cons">[[set.cons]]</a>
 ``` cpp
-explicit set(const Compare& comp,
-             const Allocator& = Allocator());
 ```
-*Effects:* Constructs an empty set using the specified comparison
 objects and allocator.
 *Complexity:* Constant.
 ``` cpp
@@ -3662,29 +4281,23 @@ template <class InputIterator>
 *Effects:* Constructs an empty `set` using the specified comparison
 object and allocator, and inserts elements from the range \[`first`,
 `last`).
-*Requires:* If the iterator’s indirection operator returns an lvalue or
-a non-const rvalue, then `Key` shall be `CopyInsertable` into `*this`.
 *Complexity:* Linear in N if the range \[`first`, `last`) is already
 sorted using `comp` and otherwise N log N, where N is `last - first`.
 #### `set` specialized algorithms <a id="set.special">[[set.special]]</a>
 ``` cpp
 template <class Key, class Compare, class Allocator>
   void swap(set<Key, Compare, Allocator>& x,
-            set<Key,Compare,Allocator>& y);
 ```
-*Effects:*
-``` cpp
-x.swap(y);
-```
 ### Class template `multiset` <a id="multiset">[[multiset]]</a>
 #### Class template `multiset` overview <a id="multiset.overview">[[multiset.overview]]</a>
@@ -3695,13 +4308,13 @@ bidirectional iterators.
 A `multiset` satisfies all of the requirements of a container, of a
 reversible container ([[container.requirements]]), of an associative
 container ([[associative.reqmts]]), and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). `multiset` also provides
-most operations described in ([[associative.reqmts]]) for duplicate
-keys. This means that a `multiset` supports the `a_eq` operations in (
-[[associative.reqmts]]) but not the `a_uniq` operations. For a
 `multiset<Key>` both the `key_type` and `value_type` are `Key`.
 Descriptions are provided here only for operations on `multiset` that
 are not described in one of these tables and for operations where there
 is additional semantic information.
@@ -3710,50 +4323,50 @@ namespace std {
   template <class Key, class Compare = less<Key>,
             class Allocator = allocator<Key>>
   class multiset {
   public:
     // types:
- typedef Key                                                     key_type;
- typedef Key                                                     value_type;
- typedef Compare                                                 key_compare;
- typedef Compare                                                 value_compare;
- typedef Allocator                                               allocator_type;
- typedef value_type&                                             reference;
- typedef const value_type&                                       const_reference;
- typedef implementation-defined                iterator;       // see [container.requirements]
- typedef implementation-defined                const_iterator; // see [container.requirements]
- typedef implementation-defined                size_type; // see [container.requirements]
- typedef implementation-defined                difference_type;// see [container.requirements]
- typedef typename allocator_traits<Allocator>::pointer           pointer;
- typedef typename allocator_traits<Allocator>::const_pointer     const_pointer;
- typedef std::reverse_iterator<iterator>       reverse_iterator;
- typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-    // construct/copy/destroy:
     multiset() : multiset(Compare()) { }
-    explicit multiset(const Compare& comp,
-                      const Allocator& = Allocator());
     template <class InputIterator>
       multiset(InputIterator first, InputIterator last,
-               const Compare& comp = Compare(),
-               const Allocator& = Allocator());
     multiset(const multiset& x);
     multiset(multiset&& x);
     explicit multiset(const Allocator&);
     multiset(const multiset&, const Allocator&);
     multiset(multiset&&, const Allocator&);
-    multiset(initializer_list<value_type>,
-      const Compare& = Compare(),
              const Allocator& = Allocator());
     template <class InputIterator>
       multiset(InputIterator first, InputIterator last, const Allocator& a)
         : multiset(first, last, Compare(), a) { }
     multiset(initializer_list<value_type> il, const Allocator& a)
       : multiset(il, Compare(), a) { }
     ~multiset();
     multiset& operator=(const multiset& x);
-    multiset& operator=(multiset&& x);
     multiset& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
     // iterators:
     iterator               begin() noexcept;
@@ -3785,16 +4398,33 @@ namespace std {
     iterator insert(const_iterator position, value_type&& x);
     template <class InputIterator>
       void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& x);
     iterator  erase(const_iterator first, const_iterator last);
-    void swap(multiset&);
     void      clear() noexcept;
     // observers:
     key_compare key_comp() const;
     value_compare value_comp() const;
     // set operations:
@@ -3822,10 +4452,29 @@ namespace std {
       pair<iterator, iterator>             equal_range(const K& x);
     template <class K>
       pair<const_iterator, const_iterator> equal_range(const K& x) const;
   };
   template <class Key, class Compare, class Allocator>
     bool operator==(const multiset<Key, Compare, Allocator>& x,
                     const multiset<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     bool operator< (const multiset<Key, Compare, Allocator>& x,
@@ -3841,38 +4490,35 @@ namespace std {
                     const multiset<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     bool operator<=(const multiset<Key, Compare, Allocator>& x,
                     const multiset<Key, Compare, Allocator>& y);
-  // specialized algorithms:
   template <class Key, class Compare, class Allocator>
     void swap(multiset<Key, Compare, Allocator>& x,
-              multiset<Key,Compare,Allocator>& y);
 }
 ```
 #### `multiset` constructors <a id="multiset.cons">[[multiset.cons]]</a>
 ``` cpp
-explicit multiset(const Compare& comp,
-                  const Allocator& = Allocator());
 ```
-*Effects:* Constructs an empty set using the specified comparison object
-and allocator.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   multiset(InputIterator first, InputIterator last,
            const Compare& comp = Compare(), const Allocator& = Allocator());
 ```
-*Requires:* If the iterator’s indirection operator returns an lvalue or
-a const rvalue, then `Key` shall be `CopyInsertable` into `*this`.
 *Effects:* Constructs an empty `multiset` using the specified comparison
 object and allocator, and inserts elements from the range \[`first`,
 `last`).
 *Complexity:* Linear in N if the range \[`first`, `last`) is already
@@ -3881,57 +4527,59 @@ sorted using `comp` and otherwise N log N, where N is `last - first`.
 #### `multiset` specialized algorithms <a id="multiset.special">[[multiset.special]]</a>
 ``` cpp
 template <class Key, class Compare, class Allocator>
   void swap(multiset<Key, Compare, Allocator>& x,
-            multiset<Key,Compare,Allocator>& y);
 ```
-*Effects:*
-``` cpp
-x.swap(y);
-```
 ## Unordered associative containers <a id="unord">[[unord]]</a>
 ### In general <a id="unord.general">[[unord.general]]</a>
 The header `<unordered_map>` defines the class templates `unordered_map`
 and `unordered_multimap`; the header `<unordered_set>` defines the class
 templates `unordered_set` and `unordered_multiset`.
 ### Header `<unordered_map>` synopsis <a id="unord.map.syn">[[unord.map.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
-  // [unord.map], class template unordered_map:
   template <class Key,
             class T,
             class Hash = hash<Key>,
-            class Pred = std::equal_to<Key>,
-            class Alloc = std::allocator<std::pair<const Key, T> > >
     class unordered_map;
-  // [unord.multimap], class template unordered_multimap:
   template <class Key,
             class T,
             class Hash = hash<Key>,
-            class Pred = std::equal_to<Key>,
-            class Alloc = std::allocator<std::pair<const Key, T> > >
     class unordered_multimap;
   template <class Key, class T, class Hash, class Pred, class Alloc>
     void swap(unordered_map<Key, T, Hash, Pred, Alloc>& x,
-              unordered_map<Key, T, Hash, Pred, Alloc>& y);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     void swap(unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
-              unordered_multimap<Key, T, Hash, Pred, Alloc>& y);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_map<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_map<Key, T, Hash, Pred, Alloc>& b);
   template <class Key, class T, class Hash, class Pred, class Alloc>
@@ -3941,41 +4589,60 @@ namespace std {
     bool operator==(const unordered_multimap<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_multimap<Key, T, Hash, Pred, Alloc>& b);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_multimap<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_multimap<Key, T, Hash, Pred, Alloc>& b);
-} // namespace std
 ```
 ### Header `<unordered_set>` synopsis <a id="unord.set.syn">[[unord.set.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
-  // [unord.set], class template unordered_set:
   template <class Key,
             class Hash = hash<Key>,
-            class Pred = std::equal_to<Key>,
-            class Alloc = std::allocator<Key> >
     class unordered_set;
-  // [unord.multiset], class template unordered_multiset:
   template <class Key,
             class Hash = hash<Key>,
-            class Pred = std::equal_to<Key>,
-            class Alloc = std::allocator<Key> >
     class unordered_multiset;
   template <class Key, class Hash, class Pred, class Alloc>
     void swap(unordered_set<Key, Hash, Pred, Alloc>& x,
-              unordered_set<Key, Hash, Pred, Alloc>& y);
   template <class Key, class Hash, class Pred, class Alloc>
     void swap(unordered_multiset<Key, Hash, Pred, Alloc>& x,
-              unordered_multiset<Key, Hash, Pred, Alloc>& y);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_set<Key, Hash, Pred, Alloc>& a,
                     const unordered_set<Key, Hash, Pred, Alloc>& b);
   template <class Key, class Hash, class Pred, class Alloc>
@@ -3985,11 +4652,25 @@ namespace std {
     bool operator==(const unordered_multiset<Key, Hash, Pred, Alloc>& a,
                     const unordered_multiset<Key, Hash, Pred, Alloc>& b);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_multiset<Key, Hash, Pred, Alloc>& a,
                     const unordered_multiset<Key, Hash, Pred, Alloc>& b);
-} // namespace std
 ```
 ### Class template `unordered_map` <a id="unord.map">[[unord.map]]</a>
 #### Class template `unordered_map` overview <a id="unord.map.overview">[[unord.map.overview]]</a>
@@ -4004,46 +4685,47 @@ an unordered associative container, and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). It provides the operations
 described in the preceding requirements table for unique keys; that is,
 an `unordered_map` supports the `a_uniq` operations in that table, not
 the `a_eq` operations. For an `unordered_map<Key, T>` the `key type` is
 `Key`, the mapped type is `T`, and the value type is
-`std::pair<const Key, T>`.
 This section only describes operations on `unordered_map` that are not
 described in one of the requirement tables, or for which there is
 additional semantic information.
 ``` cpp
 namespace std {
   template <class Key,
             class T,
             class Hash = hash<Key>,
-            class Pred = std::equal_to<Key>,
-            class Allocator = std::allocator<std::pair<const Key, T> > >
-  class unordered_map
-  {
   public:
-    // types
- typedef Key                                                 key_type;
- typedef std::pair<const Key, T>                             value_type;
- typedef T                                                   mapped_type;
- typedef Hash                                                hasher;
- typedef Pred                                                key_equal;
- typedef Allocator                                           allocator_type;
- typedef typename allocator_traits<Allocator>::pointer       pointer;
- typedef typename allocator_traits<Allocator>::const_pointer const_pointer;
- typedef value_type&                                         reference;
- typedef const value_type&                                   const_reference;
- typedef implementation-defined                              size_type;
- typedef implementation-defined                              difference_type;
- typedef implementation-defined iterator;
- typedef implementation-defined const_iterator;
- typedef implementation-defined local_iterator;
- typedef implementation-defined const_local_iterator;
-    // construct/destroy/copy
     unordered_map();
     explicit unordered_map(size_type n,
                            const hasher& hf = hasher(),
                            const key_equal& eql = key_equal(),
                            const allocator_type& a = allocator_type());
@@ -4056,12 +4738,12 @@ namespace std {
     unordered_map(const unordered_map&);
     unordered_map(unordered_map&&);
     explicit unordered_map(const Allocator&);
     unordered_map(const unordered_map&, const Allocator&);
     unordered_map(unordered_map&&, const Allocator&);
-    unordered_map(initializer_list<value_type>,
- size_type = see below,
                   const hasher& hf = hasher(),
                   const key_equal& eql = key_equal(),
                   const allocator_type& a = allocator_type());
     unordered_map(size_type n, const allocator_type& a)
       : unordered_map(n, hasher(), key_equal(), a) { }
@@ -4079,61 +4761,101 @@ namespace std {
     unordered_map(initializer_list<value_type> il, size_type n, const hasher& hf,
                   const allocator_type& a)
       : unordered_map(il, n, hf, key_equal(), a) { }
     ~unordered_map();
     unordered_map& operator=(const unordered_map&);
-    unordered_map& operator=(unordered_map&&);
     unordered_map& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
-    // size and capacity
-    bool empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    // iterators
     iterator       begin() noexcept;
     const_iterator begin() const noexcept;
     iterator       end() noexcept;
     const_iterator end() const noexcept;
     const_iterator cbegin() const noexcept;
     const_iterator cend() const noexcept;
-    // modifiers
     template <class... Args> pair<iterator, bool> emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     pair<iterator, bool> insert(const value_type& obj);
     template <class P> pair<iterator, bool> insert(P&& obj);
     iterator       insert(const_iterator hint, const value_type& obj);
     template <class P> iterator insert(const_iterator hint, P&& obj);
     template <class InputIterator> void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
     void      clear() noexcept;
- void swap(unordered_map&);
-    // observers
     hasher hash_function() const;
     key_equal key_eq() const;
-    // lookup
     iterator       find(const key_type& k);
     const_iterator find(const key_type& k) const;
     size_type      count(const key_type& k) const;
- std::pair<iterator, iterator>             equal_range(const key_type& k);
- std::pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
     mapped_type& operator[](const key_type& k);
     mapped_type& operator[](key_type&& k);
     mapped_type& at(const key_type& k);
     const mapped_type& at(const key_type& k) const;
-    // bucket interface
     size_type bucket_count() const noexcept;
     size_type max_bucket_count() const noexcept;
     size_type bucket_size(size_type n) const;
     size_type bucket(const key_type& k) const;
     local_iterator begin(size_type n);
@@ -4141,31 +4863,84 @@ namespace std {
     local_iterator end(size_type n);
     const_local_iterator end(size_type n) const;
     const_local_iterator cbegin(size_type n) const;
     const_local_iterator cend(size_type n) const;
-    // hash policy
     float load_factor() const noexcept;
     float max_load_factor() const noexcept;
     void max_load_factor(float z);
     void rehash(size_type n);
     void reserve(size_type n);
   };
-  template <class Key, class T, class Hash, class Pred, class Alloc>
-    void swap(unordered_map<Key, T, Hash, Pred, Alloc>& x,
-              unordered_map<Key, T, Hash, Pred, Alloc>& y);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_map<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_map<Key, T, Hash, Pred, Alloc>& b);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_map<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_map<Key, T, Hash, Pred, Alloc>& b);
 }
 ```
 #### `unordered_map` constructors <a id="unord.map.cnstr">[[unord.map.cnstr]]</a>
 ``` cpp
 unordered_map() : unordered_map(size_type(see below)) { }
 explicit unordered_map(size_type n,
@@ -4173,53 +4948,52 @@ explicit unordered_map(size_type n,
                        const key_equal& eql = key_equal(),
                        const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_map` using the specified hash
-function, key equality function, and allocator, and using at least *`n`*
 buckets. For the default constructor, the number of buckets is
-*implementation-defined*. `max_load_factor()` returns 1.0.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   unordered_map(InputIterator f, InputIterator l,
                 size_type n = see below,
                 const hasher& hf = hasher(),
                 const key_equal& eql = key_equal(),
                 const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_map` using the specified hash
-function, key equality function, and allocator, and using at least *`n`*
-buckets. If *`n`* is not provided, the number of buckets is
-*implementation-defined*. Then inserts elements from the range
-`[`*`f`*`, `*`l`*`)`. `max_load_factor()` returns 1.0.
 *Complexity:* Average case linear, worst case quadratic.
 #### `unordered_map` element access <a id="unord.map.elem">[[unord.map.elem]]</a>
 ``` cpp
 mapped_type& operator[](const key_type& k);
 mapped_type& operator[](key_type&& k);
 ```
-*Requires:* `mapped_type` shall be `DefaultInsertable` into `*this`. For
-the first operator, `key_type` shall be `CopyInsertable` into `*this`.
-For the second operator, `key_type` shall be `MoveConstructible`.
-*Effects:* If the `unordered_map` does not already contain an element
-whose key is equivalent to *`k`*, the first operator inserts the value
-`value_type(k, mapped_type())` and the second operator inserts the value
-`value_type(std::move(k), mapped_type())`.
-*Returns:* A reference to `x.second`, where `x` is the (unique) element
-whose key is equivalent to *`k`*.
-*Complexity:* Average case 𝑂(1), worst case 𝑂(`size()`).
 ``` cpp
 mapped_type& at(const key_type& k);
 const mapped_type& at(const key_type& k) const;
 ```
@@ -4235,35 +5009,126 @@ is present.
 ``` cpp
 template <class P>
   pair<iterator, bool> insert(P&& obj);
 ```
-*Effects:* Equivalent to `return emplace(std::forward<P>(obj))`.
 *Remarks:* This signature shall not participate in overload resolution
-unless `std::is_constructible<value_type, P&&>::value` is `true`.
 ``` cpp
 template <class P>
   iterator insert(const_iterator hint, P&& obj);
 ```
-*Effects:* Equivalent to
-`return emplace_hint(hint, std::forward<P>(obj))`.
 *Remarks:* This signature shall not participate in overload resolution
-unless `std::is_constructible<value_type, P&&>::value` is `true`.
 #### `unordered_map` swap <a id="unord.map.swap">[[unord.map.swap]]</a>
 ``` cpp
 template <class Key, class T, class Hash, class Pred, class Alloc>
   void swap(unordered_map<Key, T, Hash, Pred, Alloc>& x,
-            unordered_map<Key, T, Hash, Pred, Alloc>& y);
 ```
-*Effects:* `x.swap(y)`.
 ### Class template `unordered_multimap` <a id="unord.multimap">[[unord.multimap]]</a>
 #### Class template `unordered_multimap` overview <a id="unord.multimap.overview">[[unord.multimap.overview]]</a>
@@ -4278,46 +5143,46 @@ container, of an unordered associative container, and of an
 allocator-aware container (Table  [[tab:containers.allocatoraware]]). It
 provides the operations described in the preceding requirements table
 for equivalent keys; that is, an `unordered_multimap` supports the
 `a_eq` operations in that table, not the `a_uniq` operations. For an
 `unordered_multimap<Key, T>` the `key type` is `Key`, the mapped type is
-`T`, and the value type is `std::pair<const Key, T>`.
 This section only describes operations on `unordered_multimap` that are
 not described in one of the requirement tables, or for which there is
 additional semantic information.
 ``` cpp
 namespace std {
   template <class Key,
             class T,
             class Hash = hash<Key>,
-            class Pred = std::equal_to<Key>,
-            class Allocator = std::allocator<std::pair<const Key, T> > >
-  class unordered_multimap
-  {
   public:
-    // types
- typedef Key                                                 key_type;
- typedef std::pair<const Key, T>                             value_type;
- typedef T                                                   mapped_type;
- typedef Hash                                                hasher;
- typedef Pred                                                key_equal;
- typedef Allocator                                           allocator_type;
- typedef typename allocator_traits<Allocator>::pointer       pointer;
- typedef typename allocator_traits<Allocator>::const_pointer const_pointer;
- typedef value_type&                                         reference;
- typedef const value_type&                                   const_reference;
- typedef implementation-defined                              size_type;
- typedef implementation-defined                              difference_type;
- typedef implementation-defined iterator;
- typedef implementation-defined const_iterator;
- typedef implementation-defined local_iterator;
- typedef implementation-defined const_local_iterator;
-    // construct/destroy/copy
     unordered_multimap();
     explicit unordered_multimap(size_type n,
                                 const hasher& hf = hasher(),
                                 const key_equal& eql = key_equal(),
                                 const allocator_type& a = allocator_type());
@@ -4330,12 +5195,12 @@ namespace std {
     unordered_multimap(const unordered_multimap&);
     unordered_multimap(unordered_multimap&&);
     explicit unordered_multimap(const Allocator&);
     unordered_multimap(const unordered_multimap&, const Allocator&);
     unordered_multimap(unordered_multimap&&, const Allocator&);
-    unordered_multimap(initializer_list<value_type>,
- size_type = see below,
                        const hasher& hf = hasher(),
                        const key_equal& eql = key_equal(),
                        const allocator_type& a = allocator_type());
     unordered_multimap(size_type n, const allocator_type& a)
       : unordered_multimap(n, hasher(), key_equal(), a) { }
@@ -4353,56 +5218,78 @@ namespace std {
     unordered_multimap(initializer_list<value_type> il, size_type n, const hasher& hf,
                        const allocator_type& a)
       : unordered_multimap(il, n, hf, key_equal(), a) { }
     ~unordered_multimap();
     unordered_multimap& operator=(const unordered_multimap&);
-    unordered_multimap& operator=(unordered_multimap&&);
     unordered_multimap& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
-    // size and capacity
-    bool empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    // iterators
     iterator       begin() noexcept;
     const_iterator begin() const noexcept;
     iterator       end() noexcept;
     const_iterator end() const noexcept;
     const_iterator cbegin() const noexcept;
     const_iterator cend() const noexcept;
-    // modifiers
     template <class... Args> iterator emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     iterator insert(const value_type& obj);
     template <class P> iterator insert(P&& obj);
     iterator insert(const_iterator hint, const value_type& obj);
     template <class P> iterator insert(const_iterator hint, P&& obj);
     template <class InputIterator> void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
     void      clear() noexcept;
- void swap(unordered_multimap&);
-    // observers
     hasher hash_function() const;
     key_equal key_eq() const;
-    // lookup
     iterator       find(const key_type& k);
     const_iterator find(const key_type& k) const;
     size_type      count(const key_type& k) const;
- std::pair<iterator, iterator>             equal_range(const key_type& k);
- std::pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-    // bucket interface
     size_type bucket_count() const noexcept;
     size_type max_bucket_count() const noexcept;
     size_type bucket_size(size_type n) const;
     size_type bucket(const key_type& k) const;
     local_iterator begin(size_type n);
@@ -4418,23 +5305,78 @@ namespace std {
     void max_load_factor(float z);
     void rehash(size_type n);
     void reserve(size_type n);
   };
-  template <class Key, class T, class Hash, class Pred, class Alloc>
-    void swap(unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
-              unordered_multimap<Key, T, Hash, Pred, Alloc>& y);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_multimap<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_multimap<Key, T, Hash, Pred, Alloc>& b);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_multimap<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_multimap<Key, T, Hash, Pred, Alloc>& b);
 }
 ```
 #### `unordered_multimap` constructors <a id="unord.multimap.cnstr">[[unord.multimap.cnstr]]</a>
 ``` cpp
 unordered_multimap() : unordered_multimap(size_type(see below)) { }
 explicit unordered_multimap(size_type n,
@@ -4442,65 +5384,72 @@ explicit unordered_multimap(size_type n,
                             const key_equal& eql = key_equal(),
                             const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_multimap` using the specified
-hash function, key equality function, and allocator, and using at least
-*`n`* buckets. For the default constructor, the number of buckets is
-*implementation-defined*. `max_load_factor()` returns 1.0.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   unordered_multimap(InputIterator f, InputIterator l,
                      size_type n = see below,
                      const hasher& hf = hasher(),
                      const key_equal& eql = key_equal(),
                      const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_multimap` using the specified
-hash function, key equality function, and allocator, and using at least
-*`n`* buckets. If *`n`* is not provided, the number of buckets is
-*implementation-defined*. Then inserts elements from the range
-`[`*`f`*`, `*`l`*`)`. `max_load_factor()` returns 1.0.
 *Complexity:* Average case linear, worst case quadratic.
 #### `unordered_multimap` modifiers <a id="unord.multimap.modifiers">[[unord.multimap.modifiers]]</a>
 ``` cpp
 template <class P>
   iterator insert(P&& obj);
 ```
-*Effects:* Equivalent to `return emplace(std::forward<P>(obj))`.
 *Remarks:* This signature shall not participate in overload resolution
-unless `std::is_constructible<value_type, P&&>::value` is `true`.
 ``` cpp
 template <class P>
   iterator insert(const_iterator hint, P&& obj);
 ```
-*Effects:* Equivalent to
-`return emplace_hint(hint, std::forward<P>(obj))`.
 *Remarks:* This signature shall not participate in overload resolution
-unless `std::is_constructible<value_type, P&&>::value` is `true`.
 #### `unordered_multimap` swap <a id="unord.multimap.swap">[[unord.multimap.swap]]</a>
 ``` cpp
 template <class Key, class T, class Hash, class Pred, class Alloc>
   void swap(unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
-            unordered_multimap<Key, T, Hash, Pred, Alloc>& y);
 ```
-*Effects:* `x.swap(y)`.
 ### Class template `unordered_set` <a id="unord.set">[[unord.set]]</a>
 #### Class template `unordered_set` overview <a id="unord.set.overview">[[unord.set.overview]]</a>
@@ -4514,45 +5463,46 @@ an unordered associative container, and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). It provides the operations
 described in the preceding requirements table for unique keys; that is,
 an `unordered_set` supports the `a_uniq` operations in that table, not
 the `a_eq` operations. For an `unordered_set<Key>` the `key type` and
 the value type are both `Key`. The `iterator` and `const_iterator` types
-are both const iterator types. It is unspecified whether they are the
 same type.
 This section only describes operations on `unordered_set` that are not
 described in one of the requirement tables, or for which there is
 additional semantic information.
 ``` cpp
 namespace std {
   template <class Key,
             class Hash = hash<Key>,
-            class Pred = std::equal_to<Key>,
-            class Allocator = std::allocator<Key> >
-  class unordered_set
-  {
   public:
-    // types
- typedef Key                                                 key_type;
- typedef Key                                                 value_type;
- typedef Hash                                                hasher;
- typedef Pred                                                key_equal;
- typedef Allocator                                           allocator_type;
- typedef typename allocator_traits<Allocator>::pointer       pointer;
- typedef typename allocator_traits<Allocator>::const_pointer const_pointer;
- typedef value_type&                                         reference;
- typedef const value_type&                                   const_reference;
- typedef implementation-defined                              size_type;
- typedef implementation-defined                              difference_type;
- typedef implementation-defined iterator;
- typedef implementation-defined const_iterator;
- typedef implementation-defined local_iterator;
- typedef implementation-defined const_local_iterator;
-    // construct/destroy/copy
     unordered_set();
     explicit unordered_set(size_type n,
                            const hasher& hf = hasher(),
                            const key_equal& eql = key_equal(),
                            const allocator_type& a = allocator_type());
@@ -4565,12 +5515,12 @@ namespace std {
     unordered_set(const unordered_set&);
     unordered_set(unordered_set&&);
     explicit unordered_set(const Allocator&);
     unordered_set(const unordered_set&, const Allocator&);
     unordered_set(unordered_set&&, const Allocator&);
-    unordered_set(initializer_list<value_type>,
- size_type = see below,
                   const hasher& hf = hasher(),
                   const key_equal& eql = key_equal(),
                   const allocator_type& a = allocator_type());
     unordered_set(size_type n, const allocator_type& a)
       : unordered_set(n, hasher(), key_equal(), a) { }
@@ -4588,56 +5538,76 @@ namespace std {
     unordered_set(initializer_list<value_type> il, size_type n, const hasher& hf,
                   const allocator_type& a)
       : unordered_set(il, n, hf, key_equal(), a) { }
     ~unordered_set();
     unordered_set& operator=(const unordered_set&);
-    unordered_set& operator=(unordered_set&&);
     unordered_set& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
-    // size and capacity
-    bool empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    // iterators
     iterator       begin() noexcept;
     const_iterator begin() const noexcept;
     iterator       end() noexcept;
     const_iterator end() const noexcept;
     const_iterator cbegin() const noexcept;
     const_iterator cend() const noexcept;
-    // modifiers
     template <class... Args> pair<iterator, bool> emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     pair<iterator, bool> insert(const value_type& obj);
     pair<iterator, bool> insert(value_type&& obj);
     iterator insert(const_iterator hint, const value_type& obj);
     iterator insert(const_iterator hint, value_type&& obj);
     template <class InputIterator> void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
     void      clear() noexcept;
- void swap(unordered_set&);
-    // observers
     hasher hash_function() const;
     key_equal key_eq() const;
-    // lookup
     iterator       find(const key_type& k);
     const_iterator find(const key_type& k) const;
     size_type      count(const key_type& k) const;
- std::pair<iterator, iterator>             equal_range(const key_type& k);
- std::pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-    // bucket interface
     size_type bucket_count() const noexcept;
     size_type max_bucket_count() const noexcept;
     size_type bucket_size(size_type n) const;
     size_type bucket(const key_type& k) const;
     local_iterator begin(size_type n);
@@ -4645,31 +5615,74 @@ namespace std {
     local_iterator end(size_type n);
     const_local_iterator end(size_type n) const;
     const_local_iterator cbegin(size_type n) const;
     const_local_iterator cend(size_type n) const;
-    // hash policy
     float load_factor() const noexcept;
     float max_load_factor() const noexcept;
     void max_load_factor(float z);
     void rehash(size_type n);
     void reserve(size_type n);
   };
-  template <class Key, class Hash, class Pred, class Alloc>
-    void swap(unordered_set<Key, Hash, Pred, Alloc>& x,
-              unordered_set<Key, Hash, Pred, Alloc>& y);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_set<Key, Hash, Pred, Alloc>& a,
                     const unordered_set<Key, Hash, Pred, Alloc>& b);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_set<Key, Hash, Pred, Alloc>& a,
                     const unordered_set<Key, Hash, Pred, Alloc>& b);
 }
 ```
 #### `unordered_set` constructors <a id="unord.set.cnstr">[[unord.set.cnstr]]</a>
 ``` cpp
 unordered_set() : unordered_set(size_type(see below)) { }
 explicit unordered_set(size_type n,
@@ -4677,42 +5690,49 @@ explicit unordered_set(size_type n,
                        const key_equal& eql = key_equal(),
                        const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_set` using the specified hash
-function, key equality function, and allocator, and using at least *`n`*
 buckets. For the default constructor, the number of buckets is
-*implementation-defined*. `max_load_factor()` returns 1.0.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   unordered_set(InputIterator f, InputIterator l,
                 size_type n = see below,
                 const hasher& hf = hasher(),
                 const key_equal& eql = key_equal(),
                 const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_set` using the specified hash
-function, key equality function, and allocator, and using at least *`n`*
-buckets. If *`n`* is not provided, the number of buckets is
-*implementation-defined*. Then inserts elements from the range
-`[`*`f`*`, `*`l`*`)`. `max_load_factor()` returns 1.0.
 *Complexity:* Average case linear, worst case quadratic.
 #### `unordered_set` swap <a id="unord.set.swap">[[unord.set.swap]]</a>
 ``` cpp
 template <class Key, class Hash, class Pred, class Alloc>
   void swap(unordered_set<Key, Hash, Pred, Alloc>& x,
-            unordered_set<Key, Hash, Pred, Alloc>& y);
 ```
-*Effects:* `x.swap(y)`.
 ### Class template `unordered_multiset` <a id="unord.multiset">[[unord.multiset]]</a>
 #### Class template `unordered_multiset` overview <a id="unord.multiset.overview">[[unord.multiset.overview]]</a>
@@ -4727,45 +5747,45 @@ container, of an unordered associative container, and of an
 allocator-aware container (Table  [[tab:containers.allocatoraware]]). It
 provides the operations described in the preceding requirements table
 for equivalent keys; that is, an `unordered_multiset` supports the
 `a_eq` operations in that table, not the `a_uniq` operations. For an
 `unordered_multiset<Key>` the `key type` and the value type are both
-`Key`. The `iterator` and `const_iterator` types are both const iterator
-types. It is unspecified whether they are the same type.
 This section only describes operations on `unordered_multiset` that are
 not described in one of the requirement tables, or for which there is
 additional semantic information.
 ``` cpp
 namespace std {
   template <class Key,
             class Hash = hash<Key>,
-            class Pred = std::equal_to<Key>,
-            class Allocator = std::allocator<Key> >
-  class unordered_multiset
-  {
   public:
-    // types
- typedef Key                                                 key_type;
- typedef Key                                                 value_type;
- typedef Hash                                                hasher;
- typedef Pred                                                key_equal;
- typedef Allocator                                           allocator_type;
- typedef typename allocator_traits<Allocator>::pointer       pointer;
- typedef typename allocator_traits<Allocator>::const_pointer const_pointer;
- typedef value_type&                                         reference;
- typedef const value_type&                                   const_reference;
- typedef implementation-defined                              size_type;
- typedef implementation-defined                              difference_type;
- typedef implementation-defined iterator;
- typedef implementation-defined const_iterator;
- typedef implementation-defined local_iterator;
- typedef implementation-defined const_local_iterator;
-    // construct/destroy/copy
     unordered_multiset();
     explicit unordered_multiset(size_type n,
                                 const hasher& hf = hasher(),
                                 const key_equal& eql = key_equal(),
                                 const allocator_type& a = allocator_type());
@@ -4778,12 +5798,12 @@ namespace std {
     unordered_multiset(const unordered_multiset&);
     unordered_multiset(unordered_multiset&&);
     explicit unordered_multiset(const Allocator&);
     unordered_multiset(const unordered_multiset&, const Allocator&);
     unordered_multiset(unordered_multiset&&, const Allocator&);
-    unordered_multiset(initializer_list<value_type>,
- size_type = see below,
                        const hasher& hf = hasher(),
                        const key_equal& eql = key_equal(),
                        const allocator_type& a = allocator_type());
     unordered_multiset(size_type n, const allocator_type& a)
       : unordered_multiset(n, hasher(), key_equal(), a) { }
@@ -4801,56 +5821,76 @@ namespace std {
     unordered_multiset(initializer_list<value_type> il, size_type n, const hasher& hf,
                        const allocator_type& a)
       : unordered_multiset(il, n, hf, key_equal(), a) { }
     ~unordered_multiset();
     unordered_multiset& operator=(const unordered_multiset&);
-    unordered_multiset& operator=(unordered_multiset&&);
     unordered_multiset& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
-    // size and capacity
-    bool empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    // iterators
     iterator       begin() noexcept;
     const_iterator begin() const noexcept;
     iterator       end() noexcept;
     const_iterator end() const noexcept;
     const_iterator cbegin() const noexcept;
     const_iterator cend() const noexcept;
-    // modifiers
     template <class... Args> iterator emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     iterator insert(const value_type& obj);
     iterator insert(value_type&& obj);
     iterator insert(const_iterator hint, const value_type& obj);
     iterator insert(const_iterator hint, value_type&& obj);
     template <class InputIterator> void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
     void      clear() noexcept;
- void swap(unordered_multiset&);
-    // observers
     hasher hash_function() const;
     key_equal key_eq() const;
-    // lookup
     iterator       find(const key_type& k);
     const_iterator find(const key_type& k) const;
     size_type      count(const key_type& k) const;
- std::pair<iterator, iterator>             equal_range(const key_type& k);
- std::pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-    // bucket interface
     size_type bucket_count() const noexcept;
     size_type max_bucket_count() const noexcept;
     size_type bucket_size(size_type n) const;
     size_type bucket(const key_type& k) const;
     local_iterator begin(size_type n);
@@ -4858,30 +5898,74 @@ namespace std {
     local_iterator end(size_type n);
     const_local_iterator end(size_type n) const;
     const_local_iterator cbegin(size_type n) const;
     const_local_iterator cend(size_type n) const;
-    // hash policy
     float load_factor() const noexcept;
     float max_load_factor() const noexcept;
     void max_load_factor(float z);
     void rehash(size_type n);
     void reserve(size_type n);
   };
-  template <class Key, class Hash, class Pred, class Alloc>
-    void swap(unordered_multiset<Key, Hash, Pred, Alloc>& x,
-              unordered_multiset<Key, Hash, Pred, Alloc>& y);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_multiset<Key, Hash, Pred, Alloc>& a,
                     const unordered_multiset<Key, Hash, Pred, Alloc>& b);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_multiset<Key, Hash, Pred, Alloc>& a,
                     const unordered_multiset<Key, Hash, Pred, Alloc>& b);
 }
 ```
 #### `unordered_multiset` constructors <a id="unord.multiset.cnstr">[[unord.multiset.cnstr]]</a>
 ``` cpp
 unordered_multiset() : unordered_multiset(size_type(see below)) { }
 explicit unordered_multiset(size_type n,
@@ -4889,42 +5973,49 @@ explicit unordered_multiset(size_type n,
                             const key_equal& eql = key_equal(),
                             const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_multiset` using the specified
-hash function, key equality function, and allocator, and using at least
-*`n`* buckets. For the default constructor, the number of buckets is
-*implementation-defined*. `max_load_factor()` returns 1.0.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   unordered_multiset(InputIterator f, InputIterator l,
                      size_type n = see below,
                      const hasher& hf = hasher(),
                      const key_equal& eql = key_equal(),
                      const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_multiset` using the specified
-hash function, key equality function, and allocator, and using at least
-*`n`* buckets. If *`n`* is not provided, the number of buckets is
-*implementation-defined*. Then inserts elements from the range
-`[`*`f`*`, `*`l`*`)`. `max_load_factor()` returns 1.0.
 *Complexity:* Average case linear, worst case quadratic.
 #### `unordered_multiset` swap <a id="unord.multiset.swap">[[unord.multiset.swap]]</a>
 ``` cpp
 template <class Key, class Hash, class Pred, class Alloc>
   void swap(unordered_multiset<Key, Hash, Pred, Alloc>& x,
-            unordered_multiset<Key, Hash, Pred, Alloc>& y);
 ```
-*Effects:* `x.swap(y);`
 ## Container adaptors <a id="container.adaptors">[[container.adaptors]]</a>
 ### In general <a id="container.adaptors.general">[[container.adaptors.general]]</a>
@@ -4934,23 +6025,38 @@ The headers `<queue>` and `<stack>` define the container adaptors
 The container adaptors each take a `Container` template parameter, and
 each constructor takes a `Container` reference argument. This container
 is copied into the `Container` member of each adaptor. If the container
 takes an allocator, then a compatible allocator may be passed in to the
 adaptor’s constructor. Otherwise, normal copy or move construction is
-used for the container argument.
 For container adaptors, no `swap` function throws an exception unless
 that exception is thrown by the swap of the adaptor’s `Container` or
 `Compare` object (if any).
 ### Header `<queue>` synopsis <a id="queue.syn">[[queue.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
   template <class T, class Container = deque<T>> class queue;
   template <class T, class Container = vector<T>,
             class Compare = less<typename Container::value_type>>
     class priority_queue;
@@ -4973,10 +6079,34 @@ namespace std {
     void swap(priority_queue<T, Container, Compare>& x,
               priority_queue<T, Container, Compare>& y) noexcept(noexcept(x.swap(y)));
 }
 ```
 ### Class template `queue` <a id="queue">[[queue]]</a>
 #### `queue` definition <a id="queue.defn">[[queue.defn]]</a>
 Any sequence container supporting operations `front()`, `back()`,
@@ -4986,15 +6116,16 @@ particular, `list` ([[list]]) and `deque` ([[deque]]) can be used.
 ``` cpp
 namespace std {
   template <class T, class Container = deque<T>>
   class queue {
   public:
- typedef typename Container::value_type            value_type;
- typedef typename Container::reference             reference;
- typedef typename Container::const_reference       const_reference;
- typedef typename Container::size_type             size_type;
- typedef          Container                        container_type;
   protected:
     Container c;
   public:
     explicit queue(const Container&);
@@ -5011,17 +6142,23 @@ namespace std {
     const_reference   front() const     { return c.front(); }
     reference         back()            { return c.back(); }
     const_reference   back() const      { return c.back(); }
     void push(const value_type& x)      { c.push_back(x); }
     void push(value_type&& x)           { c.push_back(std::move(x)); }
-    template <class... Args> void emplace(Args&&... args)
-      { c.emplace_back(std::forward<Args>(args)...); }
     void pop()                          { c.pop_front(); }
-    void swap(queue& q) noexcept(noexcept(swap(c, q.c)))
       { using std::swap; swap(c, q.c); }
   };
   template <class T, class Container>
     bool operator==(const queue<T, Container>& x, const queue<T, Container>& y);
   template <class T, class Container>
     bool operator< (const queue<T, Container>& x, const queue<T, Container>& y);
   template <class T, class Container>
@@ -5056,91 +6193,80 @@ explicit queue(Container&& cont = Container());
 *Effects:*  Initializes `c` with `std::move(cont)`.
 #### `queue` constructors with allocators <a id="queue.cons.alloc">[[queue.cons.alloc]]</a>
-If `uses_allocator<container_type, Alloc>::value` is `false` the
-constructors in this subclause shall not participate in overload
-resolution.
 ``` cpp
-template <class Alloc>
-  explicit queue(const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `a`.
 ``` cpp
-template <class Alloc>
-  queue(const container_type& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `cont` as the first argument and `a` as
 the second argument.
 ``` cpp
-template <class Alloc>
-  queue(container_type&& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(cont)` as the first argument
 and `a` as the second argument.
 ``` cpp
-template <class Alloc>
-  queue(const queue& q, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `q.c` as the first argument and `a` as
 the second argument.
 ``` cpp
-template <class Alloc>
-  queue(queue&& q, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(q.c)` as the first argument
 and `a` as the second argument.
 #### `queue` operators <a id="queue.ops">[[queue.ops]]</a>
 ``` cpp
 template <class T, class Container>
- bool operator==(const queue<T, Container>& x,
-                    const queue<T, Container>& y);
 ```
 *Returns:* `x.c == y.c`.
 ``` cpp
 template <class T, class Container>
- bool operator!=(const queue<T, Container>& x,
-                    const queue<T, Container>& y);
 ```
 *Returns:* `x.c != y.c`.
 ``` cpp
 template <class T, class Container>
- bool operator< (const queue<T, Container>& x,
-                    const queue<T, Container>& y);
 ```
 *Returns:* `x.c < y.c`.
 ``` cpp
 template <class T, class Container>
- bool operator<=(const queue<T, Container>& x,
-                    const queue<T, Container>& y);
 ```
 *Returns:* `x.c <= y.c`.
 ``` cpp
 template <class T, class Container>
- bool operator> (const queue<T, Container>& x,
-                    const queue<T, Container>& y);
 ```
 *Returns:* `x.c > y.c`.
 ``` cpp
@@ -5156,11 +6282,14 @@ template <class T, class Container>
 ``` cpp
 template <class T, class Container>
   void swap(queue<T, Container>& x, queue<T, Container>& y) noexcept(noexcept(x.swap(y)));
 ```
-*Effects:* `x.swap(y)`.
 ### Class template `priority_queue` <a id="priority.queue">[[priority.queue]]</a>
 Any sequence container with random access iterator and supporting
 operations `front()`, `push_back()` and `pop_back()` can be used to
@@ -5174,15 +6303,17 @@ defines a strict weak ordering ([[alg.sorting]]).
 namespace std {
   template <class T, class Container = vector<T>,
     class Compare = less<typename Container::value_type>>
   class priority_queue {
   public:
- typedef typename Container::value_type            value_type;
- typedef typename Container::reference             reference;
- typedef typename Container::const_reference       const_reference;
- typedef typename Container::size_type             size_type;
- typedef          Container                        container_type;
   protected:
     Container c;
     Compare comp;
   public:
@@ -5194,29 +6325,43 @@ namespace std {
     template <class InputIterator>
       priority_queue(InputIterator first, InputIterator last,
              const Compare& x = Compare(), Container&& = Container());
     template <class Alloc> explicit priority_queue(const Alloc&);
     template <class Alloc> priority_queue(const Compare&, const Alloc&);
-    template <class Alloc> priority_queue(const Compare&,
- const Container&, const Alloc&);
-    template <class Alloc> priority_queue(const Compare&,
-      Container&&, const Alloc&);
     template <class Alloc> priority_queue(const priority_queue&, const Alloc&);
     template <class Alloc> priority_queue(priority_queue&&, const Alloc&);
     bool      empty() const       { return c.empty(); }
     size_type size()  const       { return c.size(); }
     const_reference   top() const { return c.front(); }
     void push(const value_type& x);
     void push(value_type&& x);
     template <class... Args> void emplace(Args&&... args);
     void pop();
-    void swap(priority_queue& q) noexcept(
-        noexcept(swap(c, q.c)) && noexcept(swap(comp, q.comp)))
       { using std::swap; swap(c, q.c); swap(comp, q.comp); }
   };
   // no equality is provided
   template <class T, class Container, class Compare>
     void swap(priority_queue<T, Container, Compare>& x,
               priority_queue<T, Container, Compare>& y) noexcept(noexcept(x.swap(y)));
   template <class T, class Container, class Compare, class Alloc>
@@ -5226,14 +6371,12 @@ namespace std {
 ```
 #### `priority_queue` constructors <a id="priqueue.cons">[[priqueue.cons]]</a>
 ``` cpp
-priority_queue(const Compare& x,
- const Container& y);
-explicit priority_queue(const Compare& x = Compare(),
-               Container&& y = Container());
 ```
 *Requires:* `x` shall define a strict weak ordering ([[alg.sorting]]).
 *Effects:* Initializes `comp` with `x` and `c` with `y` (copy
@@ -5258,24 +6401,21 @@ constructing or move constructing as appropriate); calls
 `c.insert(c.end(), first, last)`; and finally calls
 `make_heap(c.begin(), c.end(), comp)`.
 #### `priority_queue` constructors with allocators <a id="priqueue.cons.alloc">[[priqueue.cons.alloc]]</a>
-If `uses_allocator<container_type, Alloc>::value` is `false` the
-constructors in this subclause shall not participate in overload
-resolution.
 ``` cpp
-template <class Alloc>
-  explicit priority_queue(const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `a` and value-initializes `comp`.
 ``` cpp
-template <class Alloc>
-  priority_queue(const Compare& compare, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `a` and initializes `comp` with
 `compare`.
@@ -5283,31 +6423,31 @@ template <class Alloc>
 template <class Alloc>
   priority_queue(const Compare& compare, const Container& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `cont` as the first argument and `a` as
-the second argument, and initializes `comp` with `compare`.
 ``` cpp
 template <class Alloc>
   priority_queue(const Compare& compare, Container&& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(cont)` as the first argument
-and `a` as the second argument, and initializes `comp` with `compare`.
 ``` cpp
-template <class Alloc>
-  priority_queue(const priority_queue& q, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `q.c` as the first argument and `a` as
 the second argument, and initializes `comp` with `q.comp`.
 ``` cpp
-template <class Alloc>
-  priority_queue(priority_queue&& q, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(q.c)` as the first argument
 and `a` as the second argument, and initializes `comp` with
 `std::move(q.comp)`.
@@ -5316,104 +6456,84 @@ and `a` as the second argument, and initializes `comp` with
 ``` cpp
 void push(const value_type& x);
 ```
-*Effects:*
 ``` cpp
 c.push_back(x);
 push_heap(c.begin(), c.end(), comp);
 ```
 ``` cpp
 void push(value_type&& x);
 ```
-*Effects:*
 ``` cpp
 c.push_back(std::move(x));
 push_heap(c.begin(), c.end(), comp);
 ```
 ``` cpp
 template <class... Args> void emplace(Args&&... args)
 ```
-*Effects:*
 ``` cpp
 c.emplace_back(std::forward<Args>(args)...);
 push_heap(c.begin(), c.end(), comp);
 ```
 ``` cpp
 void pop();
 ```
-*Effects:*
 ``` cpp
 pop_heap(c.begin(), c.end(), comp);
 c.pop_back();
 ```
 #### `priority_queue` specialized algorithms <a id="priqueue.special">[[priqueue.special]]</a>
 ``` cpp
-template <class T, class Container, Compare>
   void swap(priority_queue<T, Container, Compare>& x,
             priority_queue<T, Container, Compare>& y) noexcept(noexcept(x.swap(y)));
 ```
-*Effects:* `x.swap(y)`.
 ### Class template `stack` <a id="stack">[[stack]]</a>
 Any sequence container supporting operations `back()`, `push_back()` and
 `pop_back()` can be used to instantiate `stack`. In particular,
 `vector` ([[vector]]), `list` ([[list]]) and `deque` ([[deque]]) can
 be used.
-#### Header `<stack>` synopsis <a id="stack.syn">[[stack.syn]]</a>
-``` cpp
-#include <initializer_list>
-namespace std {
-  template <class T, class Container = deque<T> > class stack;
-  template <class T, class Container>
-    bool operator==(const stack<T, Container>& x,const stack<T, Container>& y);
-  template <class T, class Container>
-    bool operator< (const stack<T, Container>& x,const stack<T, Container>& y);
-  template <class T, class Container>
-    bool operator!=(const stack<T, Container>& x,const stack<T, Container>& y);
-  template <class T, class Container>
-    bool operator> (const stack<T, Container>& x,const stack<T, Container>& y);
-  template <class T, class Container>
-    bool operator>=(const stack<T, Container>& x,const stack<T, Container>& y);
-  template <class T, class Container>
-    bool operator<=(const stack<T, Container>& x,const stack<T, Container>& y);
-  template <class T, class Container>
-    void swap(stack<T, Container>& x, stack<T, Container>& y) noexcept(noexcept(x.swap(y)));
-}
-```
 #### `stack` definition <a id="stack.defn">[[stack.defn]]</a>
 ``` cpp
 namespace std {
   template <class T, class Container = deque<T>>
   class stack {
   public:
- typedef typename Container::value_type            value_type;
- typedef typename Container::reference             reference;
- typedef typename Container::const_reference       const_reference;
- typedef typename Container::size_type             size_type;
- typedef          Container                        container_type;
   protected:
     Container c;
   public:
     explicit stack(const Container&);
@@ -5428,17 +6548,23 @@ namespace std {
     size_type size()  const             { return c.size(); }
     reference         top()             { return c.back(); }
     const_reference   top() const       { return c.back(); }
     void push(const value_type& x)      { c.push_back(x); }
     void push(value_type&& x)           { c.push_back(std::move(x)); }
-    template <class... Args> void emplace(Args&&... args)
-      { c.emplace_back(std::forward<Args>(args)...); }
     void pop()                          { c.pop_back(); }
-    void swap(stack& s) noexcept(noexcept(swap(c, s.c)))
       { using std::swap; swap(c, s.c); }
   };
   template <class T, class Container>
     bool operator==(const stack<T, Container>& x, const stack<T, Container>& y);
   template <class T, class Container>
     bool operator< (const stack<T, Container>& x, const stack<T, Container>& y);
   template <class T, class Container>
@@ -5472,99 +6598,87 @@ explicit stack(Container&& cont = Container());
 *Effects:* Initializes `c` with `std::move(cont)`.
 #### `stack` constructors with allocators <a id="stack.cons.alloc">[[stack.cons.alloc]]</a>
-If `uses_allocator<container_type, Alloc>::value` is `false` the
-constructors in this subclause shall not participate in overload
-resolution.
 ``` cpp
-template <class Alloc>
-  explicit stack(const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `a`.
 ``` cpp
-template <class Alloc>
-  stack(const container_type& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `cont` as the first argument and `a` as
 the second argument.
 ``` cpp
-template <class Alloc>
-  stack(container_type&& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(cont)` as the first argument
 and `a` as the second argument.
 ``` cpp
-template <class Alloc>
-  stack(const stack& s, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `s.c` as the first argument and `a` as
 the second argument.
 ``` cpp
-template <class Alloc>
-  stack(stack&& s, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(s.c)` as the first argument
 and `a` as the second argument.
 #### `stack` operators <a id="stack.ops">[[stack.ops]]</a>
 ``` cpp
 template <class T, class Container>
- bool operator==(const stack<T, Container>& x,
-                    const stack<T, Container>& y);
 ```
 *Returns:* `x.c == y.c`.
 ``` cpp
 template <class T, class Container>
- bool operator!=(const stack<T, Container>& x,
-                    const stack<T, Container>& y);
 ```
 *Returns:* `x.c != y.c`.
 ``` cpp
 template <class T, class Container>
- bool operator< (const stack<T, Container>& x,
-                    const stack<T, Container>& y);
 ```
 *Returns:* `x.c < y.c`.
 ``` cpp
 template <class T, class Container>
- bool operator<=(const stack<T, Container>& x,
-                    const stack<T, Container>& y);
 ```
 *Returns:* `x.c <= y.c`.
 ``` cpp
 template <class T, class Container>
- bool operator> (const stack<T, Container>& x,
-                    const stack<T, Container>& y);
 ```
 *Returns:* `x.c > y.c`.
 ``` cpp
 template <class T, class Container>
-    bool operator>=(const stack<T, Container>& x,
-                    const stack<T, Container>& y);
 ```
 *Returns:* `x.c >= y.c`.
 #### `stack` specialized algorithms <a id="stack.special">[[stack.special]]</a>
@@ -5572,26 +6686,31 @@ template <class T, class Container>
 ``` cpp
 template <class T, class Container>
   void swap(stack<T, Container>& x, stack<T, Container>& y) noexcept(noexcept(x.swap(y)));
 ```
-*Effects:* `x.swap(y)`.
 <!-- Link reference definitions -->
 [alg.sorting]: algorithms.md#alg.sorting
 [algorithm.stable]: library.md#algorithm.stable
 [algorithms]: algorithms.md#algorithms
 [allocator.requirements]: library.md#allocator.requirements
 [allocator.traits.members]: utilities.md#allocator.traits.members
 [array]: #array
 [array.cons]: #array.cons
 [array.data]: #array.data
 [array.fill]: #array.fill
 [array.overview]: #array.overview
 [array.size]: #array.size
 [array.special]: #array.special
 [array.swap]: #array.swap
 [array.tuple]: #array.tuple
 [array.zero]: #array.zero
 [associative]: #associative
 [associative.general]: #associative.general
 [associative.map.syn]: #associative.map.syn
@@ -5602,10 +6721,17 @@ template <class T, class Container>
 [class.copy]: special.md#class.copy
 [class.ctor]: special.md#class.ctor
 [class.dtor]: special.md#class.dtor
 [container.adaptors]: #container.adaptors
 [container.adaptors.general]: #container.adaptors.general
 [container.requirements]: #container.requirements
 [container.requirements.dataraces]: #container.requirements.dataraces
 [container.requirements.general]: #container.requirements.general
 [containers]: #containers
 [containers.general]: #containers.general
@@ -5614,28 +6740,32 @@ template <class T, class Container>
 [deque.capacity]: #deque.capacity
 [deque.cons]: #deque.cons
 [deque.modifiers]: #deque.modifiers
 [deque.overview]: #deque.overview
 [deque.special]: #deque.special
 [forward.iterators]: iterators.md#forward.iterators
 [forwardlist]: #forwardlist
 [forwardlist.access]: #forwardlist.access
 [forwardlist.cons]: #forwardlist.cons
 [forwardlist.iter]: #forwardlist.iter
 [forwardlist.modifiers]: #forwardlist.modifiers
 [forwardlist.ops]: #forwardlist.ops
 [forwardlist.overview]: #forwardlist.overview
 [forwardlist.spec]: #forwardlist.spec
 [hash.requirements]: library.md#hash.requirements
 [iterator.requirements]: iterators.md#iterator.requirements
 [list]: #list
 [list.capacity]: #list.capacity
 [list.cons]: #list.cons
 [list.modifiers]: #list.modifiers
 [list.ops]: #list.ops
 [list.overview]: #list.overview
 [list.special]: #list.special
 [map]: #map
 [map.access]: #map.access
 [map.cons]: #map.cons
 [map.modifiers]: #map.modifiers
 [map.overview]: #map.overview
@@ -5659,10 +6789,11 @@ template <class T, class Container>
 [queue.cons.alloc]: #queue.cons.alloc
 [queue.defn]: #queue.defn
 [queue.ops]: #queue.ops
 [queue.special]: #queue.special
 [queue.syn]: #queue.syn
 [res.on.data.races]: library.md#res.on.data.races
 [sequence.reqmts]: #sequence.reqmts
 [sequences]: #sequences
 [sequences.general]: #sequences.general
 [set]: #set
@@ -5675,15 +6806,17 @@ template <class T, class Container>
 [stack.defn]: #stack.defn
 [stack.ops]: #stack.ops
 [stack.special]: #stack.special
 [stack.syn]: #stack.syn
 [strings]: strings.md#strings
 [tab:HashRequirements]: #tab:HashRequirements
 [tab:containers.allocatoraware]: #tab:containers.allocatoraware
 [tab:containers.associative.requirements]: #tab:containers.associative.requirements
 [tab:containers.container.requirements]: #tab:containers.container.requirements
 [tab:containers.lib.summary]: #tab:containers.lib.summary
 [tab:containers.optional.operations]: #tab:containers.optional.operations
 [tab:containers.reversible.requirements]: #tab:containers.reversible.requirements
 [tab:containers.sequence.optional]: #tab:containers.sequence.optional
 [tab:containers.sequence.requirements]: #tab:containers.sequence.requirements
 [temp.deduct]: temp.md#temp.deduct
@@ -5719,10 +6852,11 @@ template <class T, class Container>
 [vector.cons]: #vector.cons
 [vector.data]: #vector.data
 [vector.modifiers]: #vector.modifiers
 [vector.overview]: #vector.overview
 [vector.special]: #vector.special
 [^1]: Equality comparison is a refinement of partitioning if no two
     objects that compare equal fall into different partitions.
 [^2]: These member functions are only provided by containers whose

 Containers are objects that store other objects. They control allocation
 and deallocation of these objects through constructors, destructors,
 insert and erase operations.
 All of the complexity requirements in this Clause are stated solely in
+terms of the number of operations on the contained objects.
+[*Example 1*: The copy constructor of type `vector<vector<int>>` has
+linear complexity, even though the complexity of copying each contained
+`vector<int>` is itself linear. — *end example*]
 For the components affected by this subclause that declare an
 `allocator_type`, objects stored in these components shall be
+constructed using the function
+`allocator_traits<allocator_type>::rebind_traits<U>::{}construct` and
+destroyed using the function
+`allocator_traits<allocator_type>::rebind_traits<U>::{}destroy` (
+[[allocator.traits.members]]), where `U` is either
+`allocator_type::value_type` or an internal type used by the container.
+These functions are called only for the container’s element type, not
+for internal types used by the container.
+[*Note 1*: This means, for example, that a node-based container might
+need to construct nodes containing aligned buffers and call `construct`
+to place the element into the buffer. — *end note*]
 In Tables  [[tab:containers.container.requirements]],
 [[tab:containers.reversible.requirements]], and
 [[tab:containers.optional.operations]] `X` denotes a container class
 containing objects of type `T`, `a` and `b` denote values of type `X`,
 `u` denotes an identifier, `r` denotes a non-const value of type `X`,
 and `rv` denotes a non-const rvalue of type `X`.
 Those entries marked “(Note A)” or “(Note B)” have linear complexity for
 `array` and have constant complexity for all other standard containers.
+[*Note 2*: The algorithm `equal()` is defined in Clause
+[[algorithms]]. — *end note*]
 The member function `size()` returns the number of elements in the
 container. The number of elements is defined by the rules of
 constructors, inserts, and erases.
 `begin()`
 returns an iterator referring to the first element in the container.
 `end()` returns an iterator which is the past-the-end value for the
+container. If the container is empty, then `begin() == end()`.
 In the expressions
 ``` cpp
 i == j
 either or both may be replaced by an object of the container’s
 `const_iterator` type referring to the same element with no change in
 semantics.
 Unless otherwise specified, all containers defined in this clause obtain
+memory using an allocator (see  [[allocator.requirements]]).
+[*Note 3*: In particular, containers and iterators do not store
+references to allocated elements other than through the allocator’s
+pointer type, i.e., as objects of type `P` or
+`pointer_traits<P>::template rebind<unspecified>`, where `P` is
+`allocator_traits<allocator_type>::pointer`. — *end note*]
+Copy constructors for these container types obtain an allocator by
+calling
 `allocator_traits<allocator_type>::select_on_container_copy_construction`
 on the allocator belonging to the container being copied. Move
 constructors obtain an allocator by move construction from the allocator
 belonging to the container being moved. Such move construction of the
 allocator shall not exit via an exception. All other constructors for
+these container types take a `const allocator_type&` argument.
+[*Note 4*: If an invocation of a constructor uses the default value of
+an optional allocator argument, then the `Allocator` type must support
+value-initialization. — *end note*]
+A copy of this allocator is used for any memory allocation and element
+construction performed, by these constructors and by all member
+functions, during the lifetime of each container object or until the
+allocator is replaced. The allocator may be replaced only via assignment
+or `swap()`. Allocator replacement is performed by copy assignment, move
+assignment, or swapping of the allocator only if
 `allocator_traits<allocator_type>::propagate_on_container_copy_assignment::value`,
 `allocator_traits<allocator_type>::propagate_on_container_move_assignment::value`,
 or
 `allocator_traits<allocator_type>::propagate_on_container_swap::value`
+is `true` within the implementation of the corresponding container
+operation. In all container types defined in this Clause, the member
 `get_allocator()` returns a copy of the allocator used to construct the
 container or, if that allocator has been replaced, a copy of the most
 recent replacement.
 The expression `a.swap(b)`, for containers `a` and `b` of a standard
 container type other than `array`, shall exchange the values of `a` and
 `b` without invoking any move, copy, or swap operations on the
+individual container elements. Lvalues of any `Compare`, `Pred`, or
+`Hash` types belonging to `a` and `b` shall be swappable and shall be
+exchanged by calling `swap` as described in  [[swappable.requirements]].
+If
 `allocator_traits<allocator_type>::propagate_on_container_swap::value`
+is `true`, then lvalues of type `allocator_type` shall be swappable and
+the allocators of `a` and `b` shall also be exchanged by calling `swap`
+as described in  [[swappable.requirements]]. Otherwise, the allocators
+shall not be swapped, and the behavior is undefined unless
 `a.get_allocator() == b.get_allocator()`. Every iterator referring to an
 element in one container before the swap shall refer to the same element
 in the other container after the swap. It is unspecified whether an
 iterator with value `a.end()` before the swap will have value `b.end()`
 after the swap.
 - no copy constructor or assignment operator of a returned iterator
   throws an exception.
 - no `swap()` function throws an exception.
 - no `swap()` function invalidates any references, pointers, or
   iterators referring to the elements of the containers being swapped.
+ \[*Note 5*: The `end()` iterator does not refer to any element, so it
+ may be invalidated. — *end note*]
 Unless otherwise specified (either explicitly or by defining a function
 in terms of other functions), invoking a container member function or
 passing a container as an argument to a library function shall not
 invalidate iterators to, or change the values of, objects within that
 container.
+A *contiguous container* is a container that supports random access
+iterators ([[random.access.iterators]]) and whose member types
+`iterator` and `const_iterator` are contiguous iterators (
+[[iterator.requirements.general]]).
 Table  [[tab:containers.optional.operations]] lists operations that are
 provided for some types of containers but not others. Those containers
 for which the listed operations are provided shall implement the
 semantics described in Table  [[tab:containers.optional.operations]]
 unless otherwise stated.
+[*Note 6*: The algorithm `lexicographical_compare()` is defined in
+Clause  [[algorithms]]. — *end note*]
+All of the containers defined in this Clause and in  [[basic.string]]
 except `array` meet the additional requirements of an allocator-aware
 container, as described in Table  [[tab:containers.allocatoraware]].
+Given an allocator type `A` and given a container type `X` having a
+`value_type` identical to `T` and an `allocator_type` identical to
+`allocator_traits<A>::rebind_alloc<T>` and given an lvalue `m` of type
+`A`, a pointer `p` of type `T*`, an expression `v` of type (possibly
+`const`) `T`, and an rvalue `rv` of type `T`, the following terms are
+defined. If `X` is not allocator-aware, the terms below are defined as
+if `A` were `allocator<T>` — no allocator object needs to be created and
+user specializations of `allocator<T>` are not instantiated:
 - `T` is *`DefaultInsertable` into `X`* means that the following
   expression is well-formed:
   ``` cpp
   allocator_traits<A>::construct(m, p)
   allocator_traits<A>::construct(m, p, rv)
   ```
   and its evaluation causes the following postcondition to hold: The
   value of `*p` is equivalent to the value of `rv` before the
+  evaluation.
+  \[*Note 7*: `rv` remains a valid object. Its state is
+  unspecified — *end note*]
 - `T` is *`CopyInsertable` into `X`* means that, in addition to `T`
   being `MoveInsertable` into `X`, the following expression is
   well-formed:
   ``` cpp
   allocator_traits<A>::construct(m, p, v)
   well-formed:
   ``` cpp
   allocator_traits<A>::destroy(m, p)
   ```
+[*Note 8*: A container calls
+`allocator_traits<A>::construct(m, p, args)` to construct an element at
+`p` using `args`, with `m == get_allocator()`. The default `construct`
+in `allocator` will call `::new((void*)p) T(args)`, but specialized
+allocators may choose a different definition. — *end note*]
 In Table  [[tab:containers.allocatoraware]], `X` denotes an
 allocator-aware container class with a `value_type` of `T` using
 allocator of type `A`, `u` denotes a variable, `a` and `b` denote
 non-const lvalues of type `X`, `t` denotes an lvalue or a const rvalue
 of type `X`, `rv` denotes a non-const rvalue of type `X`, and `m` is a
 value of type `A`.
+The behavior of certain container member functions and deduction guides
+depends on whether types qualify as input iterators or allocators. The
+extent to which an implementation determines that a type cannot be an
+input iterator is unspecified, except that as a minimum integral types
+shall not qualify as input iterators. Likewise, the extent to which an
+implementation determines that a type cannot be an allocator is
+unspecified, except that as a minimum a type `A` shall not qualify as an
+allocator unless it satisfies both of the following conditions:
+- The *qualified-id* `A::value_type` is valid and denotes a type (
+  [[temp.deduct]]).
+- The expression `declval<A&>().allocate(size_t{})` is well-formed when
+  treated as an unevaluated operand.
 ### Container data races <a id="container.requirements.dataraces">[[container.requirements.dataraces]]</a>
 For purposes of avoiding data races ([[res.on.data.races]]),
 implementations shall consider the following functions to be `const`:
 `begin`, `end`, `rbegin`, `rend`, `front`, `back`, `data`, `find`,
 `lower_bound`, `upper_bound`, `equal_range`, `at` and, except in
 associative or unordered associative containers, `operator[]`.
+Notwithstanding  [[res.on.data.races]], implementations are required to
+avoid data races when the contents of the contained object in different
+elements in the same container, excepting `vector<bool>`, are modified
+concurrently.
+[*Note 1*: For a `vector<int> x` with a size greater than one,
+`x[1] = 5` and `*x.begin() = 10` can be executed concurrently without a
+data race, but `x[0] = 5` and `*x.begin() = 10` executed concurrently
+may result in a data race. As an exception to the general rule, for a
+`vector<bool> y`, `y[0] = true` may race with
+`y[1] = true`. — *end note*]
 ### Sequence containers <a id="sequence.reqmts">[[sequence.reqmts]]</a>
 A sequence container organizes a finite set of objects, all of the same
 type, into a strictly linear arrangement. The library provides four
 of choice when most insertions and deletions take place at the beginning
 or at the end of the sequence.
 In Tables  [[tab:containers.sequence.requirements]] and
 [[tab:containers.sequence.optional]], `X` denotes a sequence container
+class, `a` denotes a value of type `X` containing elements of type `T`,
+`u` denotes the name of a variable being declared, `A` denotes
+`X::allocator_type` if the *qualified-id* `X::allocator_type` is valid
+and denotes a type ([[temp.deduct]]) and `allocator<T>` if it doesn’t,
+`i` and `j` denote iterators satisfying input iterator requirements and
+refer to elements implicitly convertible to `value_type`, `[i, j)`
+denotes a valid range, `il` designates an object of type
+`initializer_list<value_type>`, `n` denotes a value of type
+`X::size_type`, `p` denotes a valid constant iterator to `a`, `q`
+denotes a valid dereferenceable constant iterator to `a`, `[q1, q2)`
+denotes a valid range of constant iterators in `a`, `t` denotes an
+lvalue or a const rvalue of `X::value_type`, and `rv` denotes a
+non-const rvalue of `X::value_type`. `Args` denotes a template parameter
+pack; `args` denotes a function parameter pack with the pattern
+`Args&&`.
 The complexities of the expressions are sequence dependent.
 The iterator returned from `a.insert(p, t)` points to the copy of `t`
 inserted into `a`.
 The iterator returned from `a.insert(p, rv)` points to the copy of `rv`
 inserted into `a`.
 - If the constructor
   ``` cpp
   template <class InputIterator>
     X(InputIterator first, InputIterator last,
+ const allocator_type& alloc = allocator_type());
   ```
   is called with a type `InputIterator` that does not qualify as an
   input iterator, then the constructor shall not participate in overload
   resolution.
 - If the member functions of the forms:
   ``` cpp
+  template <class InputIterator>
+    return-type F(const_iterator p,
+                  InputIterator first, InputIterator last);       // such as insert
+  template <class InputIterator>
+    return-type F(InputIterator first, InputIterator last);       // such as append, assign
+  template <class InputIterator>
+    return-type F(const_iterator i1, const_iterator i2,
+                  InputIterator first, InputIterator last);       // such as replace
   ```
   are called with a type `InputIterator` that does not qualify as an
   input iterator, then these functions shall not participate in overload
   resolution.
+- A deduction guide for a sequence container shall not participate in
+  overload resolution if it has an `InputIterator` template parameter
+  and a type that does not qualify as an input iterator is deduced for
+  that parameter, or if it has an `Allocator` template parameter and a
+  type that does not qualify as an allocator is deduced for that
+  parameter.
 Table  [[tab:containers.sequence.optional]] lists operations that are
 provided for some types of sequence containers but not others. An
 implementation shall provide these operations for all container types
 shown in the “container” column, and shall implement them so as to take
 amortized constant time.
 The member function `at()` provides bounds-checked access to container
 elements. `at()` throws `out_of_range` if `n >= a.size()`.
+### Node handles <a id="container.node">[[container.node]]</a>
+#### `node_handle` overview <a id="container.node.overview">[[container.node.overview]]</a>
+A *node handle* is an object that accepts ownership of a single element
+from an associative container ([[associative.reqmts]]) or an unordered
+associative container ([[unord.req]]). It may be used to transfer that
+ownership to another container with compatible nodes. Containers with
+compatible nodes have the same node handle type. Elements may be
+transferred in either direction between container types in the same row
+of Table  [[tab:containers.node.compat]].
+**Table: Container types with compatible nodes** <a id="tab:containers.node.compat">[tab:containers.node.compat]</a>
+|                                  |                                       |
+| -------------------------------- | ------------------------------------- |
+| `map<K, T, C1, A>`               | `map<K, T, C2, A>`                    |
+| `map<K, T, C1, A>`               | `multimap<K, T, C2, A>`               |
+| `set<K, C1, A>`                  | `set<K, C2, A>`                       |
+| `set<K, C1, A>`                  | `multiset<K, C2, A>`                  |
+| `unordered_map<K, T, H1, E1, A>` | `unordered_map<K, T, H2, E2, A>`      |
+| `unordered_map<K, T, H1, E1, A>` | `unordered_multimap<K, T, H2, E2, A>` |
+| `unordered_set<K, H1, E1, A>`    | `unordered_set<K, H2, E2, A>`         |
+| `unordered_set<K, H1, E1, A>`    | `unordered_multiset<K, H2, E2, A>`    |
+If a node handle is not empty, then it contains an allocator that is
+equal to the allocator of the container when the element was extracted.
+If a node handle is empty, it contains no allocator.
+Class `node_handle` is for exposition only. An implementation is
+permitted to provide equivalent functionality without providing a class
+with this name.
+If a user-defined specialization of `pair` exists for
+`pair<const Key, T>` or `pair<Key, T>`, where `Key` is the container’s
+`key_type` and `T` is the container’s `mapped_type`, the behavior of
+operations involving node handles is undefined.
+``` cpp
+template<unspecified>
+  class node_handle {
+  public:
+    // These type declarations are described in Tables [tab:containers.associative.requirements] and [tab:HashRequirements].
+    using value_type     = see below;   // not present for map containers
+    using key_type       = see below;   // not present for set containers
+    using mapped_type    = see below;   // not present for set containers
+    using allocator_type = see below;
+  private:
+    using container_node_type = unspecified;
+    using ator_traits = allocator_traits<allocator_type>;
+    typename ator_traits::rebind_traits<container_node_type>::pointer ptr_;
+    optional<allocator_type> alloc_;
+  public:
+    constexpr node_handle() noexcept : ptr_(), alloc_() {}
+    ~node_handle();
+    node_handle(node_handle&&) noexcept;
+    node_handle& operator=(node_handle&&);
+    value_type& value() const;          // not present for map containers
+    key_type& key() const;              // not present for set containers
+    mapped_type& mapped() const;        // not present for set containers
+    allocator_type get_allocator() const;
+    explicit operator bool() const noexcept;
+    bool empty() const noexcept;
+    void swap(node_handle&)
+      noexcept(ator_traits::propagate_on_container_swap::value ||
+               ator_traits::is_always_equal::value);
+    friend void swap(node_handle& x, node_handle& y) noexcept(noexcept(x.swap(y))) {
+      x.swap(y);
+    }
+};
+```
+#### `node_handle` constructors, copy, and assignment <a id="container.node.cons">[[container.node.cons]]</a>
+``` cpp
+node_handle(node_handle&& nh) noexcept;
+```
+*Effects:* Constructs a *`node_handle`* object initializing `ptr_` with
+`nh.ptr_`. Move constructs `alloc_` with `nh.alloc_`. Assigns `nullptr`
+to `nh.ptr_` and assigns `nullopt` to `nh.alloc_`.
+``` cpp
+node_handle& operator=(node_handle&& nh);
+```
+*Requires:* Either `!alloc_`, or
+`ator_traits::propagate_on_container_move_assignment` is `true`, or
+`alloc_ == nh.alloc_`.
+*Effects:*
+- If `ptr_ != nullptr`, destroys the `value_type` subobject in the
+  `container_node_type` object pointed to by `ptr_` by calling
+  `ator_traits::destroy`, then deallocates `ptr_` by calling
+  `ator_traits::rebind_traits<container_node_type>::deallocate`.
+- Assigns `nh.ptr_` to `ptr_`.
+- If `!alloc` or `ator_traits::propagate_on_container_move_assignment`
+  is `true`, move assigns `nh.alloc_` to `alloc_`.
+- Assigns `nullptr` to `nh.ptr_` and assigns `nullopt` to `nh.alloc_`.
+*Returns:* `*this`.
+*Throws:* Nothing.
+#### `node_handle` destructor <a id="container.node.dtor">[[container.node.dtor]]</a>
+``` cpp
+~node_handle();
+```
+*Effects:* If `ptr_ != nullptr`, destroys the `value_type` subobject in
+the `container_node_type` object pointed to by `ptr_` by calling
+`ator_traits::destroy`, then deallocates `ptr_` by calling
+`ator_traits::rebind_traits<container_node_type>::deallocate`.
+#### `node_handle` observers <a id="container.node.observers">[[container.node.observers]]</a>
+``` cpp
+value_type& value() const;
+```
+*Requires:* `empty() == false`.
+*Returns:* A reference to the `value_type` subobject in the
+`container_node_type` object pointed to by `ptr_`.
+*Throws:* Nothing.
+``` cpp
+key_type& key() const;
+```
+*Requires:* `empty() == false`.
+*Returns:* A non-const reference to the `key_type` member of the
+`value_type` subobject in the `container_node_type` object pointed to by
+`ptr_`.
+*Throws:* Nothing.
+*Remarks:* Modifying the key through the returned reference is
+permitted.
+``` cpp
+mapped_type& mapped() const;
+```
+*Requires:* `empty() == false`.
+*Returns:* A reference to the `mapped_type` member of the `value_type`
+subobject in the `container_node_type` object pointed to by `ptr_`.
+*Throws:* Nothing.
+``` cpp
+allocator_type get_allocator() const;
+```
+*Requires:* `empty() == false`.
+*Returns:* `*alloc_`.
+*Throws:* Nothing.
+``` cpp
+explicit operator bool() const noexcept;
+```
+*Returns:* `ptr_ != nullptr`.
+``` cpp
+bool empty() const noexcept;
+```
+*Returns:* `ptr_ == nullptr`.
+#### `node_handle` modifiers <a id="container.node.modifiers">[[container.node.modifiers]]</a>
+``` cpp
+void swap(node_handle& nh)
+  noexcept(ator_traits::propagate_on_container_swap::value ||
+           ator_traits::is_always_equal::value);
+```
+*Requires:* `!alloc_`, or `!nh.alloc_`, or
+`ator_traits::propagate_on_container_swap` is `true`, or
+`alloc_ == nh.alloc_`.
+*Effects:* Calls `swap(ptr_, nh.ptr_)`. If `!alloc_`, or `!nh.alloc_`,
+or `ator_traits::propagate_on_container_swap` is `true` calls
+`swap(alloc_, nh.alloc_)`.
+### Insert return type <a id="container.insert.return">[[container.insert.return]]</a>
+The associative containers with unique keys and the unordered containers
+with unique keys have a member function `insert` that returns a nested
+type `insert_return_type`. That return type is a specialization of the
+type specified in this subclause.
+``` cpp
+template <class Iterator, class NodeType>
+struct INSERT_RETURN_TYPE
+{
+  Iterator position;
+  bool     inserted;
+  NodeType node;
+};
+```
+The name `INSERT_RETURN_TYPE` is exposition only. `INSERT_RETURN_TYPE`
+has the template parameters, data members, and special members specified
+above. It has no base classes or members other than those specified.
 ### Associative containers <a id="associative.reqmts">[[associative.reqmts]]</a>
 Associative containers provide fast retrieval of data based on keys. The
 library provides four basic kinds of associative containers: `set`,
 `multiset`, `map` and `multimap`.
 of an associative container is of the bidirectional iterator category.
 For associative containers where the value type is the same as the key
 type, both `iterator` and `const_iterator` are constant iterators. It is
 unspecified whether or not `iterator` and `const_iterator` are the same
+type.
+[*Note 1*: `iterator` and `const_iterator` have identical semantics in
+this case, and `iterator` is convertible to `const_iterator`. Users can
+avoid violating the one-definition rule by always using `const_iterator`
+in their function parameter lists. — *end note*]
 The associative containers meet all the requirements of Allocator-aware
 containers ([[container.requirements.general]]), except that for `map`
 and `multimap`, the requirements placed on `value_type` in Table
 [[tab:containers.container.requirements]] apply instead to `key_type`
+and `mapped_type`.
+[*Note 2*: For example, in some cases `key_type` and `mapped_type` are
+required to be `CopyAssignable` even though the associated `value_type`,
+`pair<const key_type, mapped_type>`, is not
+`CopyAssignable`. — *end note*]
 In Table  [[tab:containers.associative.requirements]], `X` denotes an
+associative container class, `a` denotes a value of type `X`, `a2`
+denotes a value of a type with nodes compatible with type `X` (Table
+[[tab:containers.node.compat]]), `b` denotes a possibly `const` value of
+type `X`, `u` denotes the name of a variable being declared, `a_uniq`
+denotes a value of type `X` when `X` supports unique keys, `a_eq`
+denotes a value of type `X` when `X` supports multiple keys, `a_tran`
+denotes a possibly `const` value of type `X` when the *qualified-id*
+`X::key_compare::is_transparent` is valid and denotes a type (
+[[temp.deduct]]), `i` and `j` satisfy input iterator requirements and
+refer to elements implicitly convertible to `value_type`, \[`i`, `j`)
+denotes a valid range, `p` denotes a valid constant iterator to `a`, `q`
+denotes a valid dereferenceable constant iterator to `a`, `r` denotes a
+valid dereferenceable iterator to `a`, `[q1, q2)` denotes a valid range
+of constant iterators in `a`, `il` designates an object of type
+`initializer_list<value_type>`, `t` denotes a value of type
+`X::value_type`, `k` denotes a value of type `X::key_type` and `c`
+denotes a possibly `const` value of type `X::key_compare`; `kl` is a
+value such that `a` is partitioned ([[alg.sorting]]) with respect to
 `c(r, kl)`, with `r` the key value of `e` and `e` in `a`; `ku` is a
 value such that `a` is partitioned with respect to `!c(ku, r)`; `ke` is
 a value such that `a` is partitioned with respect to `c(r, ke)` and
 `!c(ke, r)`, with `c(r, ke)` implying `!c(ke, r)`. `A` denotes the
+storage allocator used by `X`, if any, or `allocator<X::value_type>`
+otherwise, `m` denotes an allocator of a type convertible to `A`, and
+`nh` denotes a non-const rvalue of type `X::node_type`.
 The `insert` and `emplace` members shall not affect the validity of
 iterators and references to the container, and the `erase` members shall
 invalidate only iterators and references to the erased elements.
+The `extract` members invalidate only iterators to the removed element;
+pointers and references to the removed element remain valid. However,
+accessing the element through such pointers and references while the
+element is owned by a `node_type` is undefined behavior. References and
+pointers to an element obtained while it is owned by a `node_type` are
+invalidated if the element is successfully inserted.
 The fundamental property of iterators of associative containers is that
 they iterate through the containers in the non-descending order of keys
 where non-descending is defined by the comparison that was used to
 construct them. For any two dereferenceable iterators `i` and `j` such
+that distance from `i` to `j` is positive, the following condition
+holds:
 ``` cpp
 value_comp(*j, *i) == false
 ```
 For associative containers with unique keys the stronger condition
+holds:
 ``` cpp
+value_comp(*i, *j) != false
 ```
 When an associative container is constructed by passing a comparison
 object the container shall not store a pointer or reference to the
 passed object, even if that object is passed by reference. When an
 object from the container being copied, as if that comparison object had
 been passed to the target container in its constructor.
 The member function templates `find`, `count`, `lower_bound`,
 `upper_bound`, and `equal_range` shall not participate in overload
+resolution unless the *qualified-id* `Compare::is_transparent` is valid
 and denotes a type ([[temp.deduct]]).
+A deduction guide for an associative container shall not participate in
+overload resolution if any of the following are true:
+- It has an `InputIterator` template parameter and a type that does not
+  qualify as an input iterator is deduced for that parameter.
+- It has an `Allocator` template parameter and a type that does not
+  qualify as an allocator is deduced for that parameter.
+- It has a `Compare` template parameter and a type that qualifies as an
+  allocator is deduced for that parameter.
 #### Exception safety guarantees <a id="associative.reqmts.except">[[associative.reqmts.except]]</a>
 For associative containers, no `clear()` function throws an exception.
 `erase(k)` does not throw an exception unless that exception is thrown
 by the container’s `Compare` object (if any).
 the container.
 Two values `k1` and `k2` of type `Key` are considered equivalent if the
 container’s key equality predicate returns `true` when passed those
 values. If `k1` and `k2` are equivalent, the container’s hash function
+shall return the same value for both.
+[*Note 1*: Thus, when an unordered associative container is
+instantiated with a non-default `Pred` parameter it usually needs a
+non-default `Hash` parameter as well. — *end note*]
+For any two keys `k1` and `k2` in the same container, calling
+`pred(k1, k2)` shall always return the same value. For any key `k` in a
+container, calling `hash(k)` shall always return the same value.
 An unordered associative container supports *unique keys* if it may
 contain at most one element for each key. Otherwise, it supports
 *equivalent keys*. `unordered_set` and `unordered_map` support unique
 keys. `unordered_multiset` and `unordered_multimap` support equivalent
 keys. In containers that support equivalent keys, elements with
 equivalent keys are adjacent to each other in the iteration order of the
 container. Thus, although the absolute order of elements in an unordered
 container is not specified, its elements are grouped into
+*equivalent-key groups* such that all elements of each group have
 equivalent keys. Mutating operations on unordered containers shall
 preserve the relative order of elements within each equivalent-key group
 unless otherwise specified.
 For `unordered_set` and `unordered_multiset` the value type is the same
 as the key type. For `unordered_map` and `unordered_multimap` it is
+`pair<const Key,
 T>`.
 For unordered containers where the value type is the same as the key
 type, both `iterator` and `const_iterator` are constant iterators. It is
 unspecified whether or not `iterator` and `const_iterator` are the same
+type.
+[*Note 2*: `iterator` and `const_iterator` have identical semantics in
+this case, and `iterator` is convertible to `const_iterator`. Users can
+avoid violating the one-definition rule by always using `const_iterator`
+in their function parameter lists. — *end note*]
 The elements of an unordered associative container are organized into
 *buckets*. Keys with the same hash code appear in the same bucket. The
 number of buckets is automatically increased as elements are added to an
 unordered associative container, so that the average number of elements
 The unordered associative containers meet all the requirements of
 Allocator-aware containers ([[container.requirements.general]]), except
 that for `unordered_map` and `unordered_multimap`, the requirements
 placed on `value_type` in Table
 [[tab:containers.container.requirements]] apply instead to `key_type`
+and `mapped_type`.
+[*Note 3*: For example, `key_type` and `mapped_type` are sometimes
+required to be `CopyAssignable` even though the associated `value_type`,
+`pair<const key_type, mapped_type>`, is not
+`CopyAssignable`. — *end note*]
+In Table  [[tab:HashRequirements]]: `X` denotes an unordered associative
+container class, `a` denotes a value of type `X`, `a2` denotes a value
+of a type with nodes compatible with type `X` (Table
+[[tab:containers.node.compat]]), `b` denotes a possibly const value of
+type `X`, `a_uniq` denotes a value of type `X` when `X` supports unique
+keys, `a_eq` denotes a value of type `X` when `X` supports equivalent
+keys, `i` and `j` denote input iterators that refer to `value_type`,
+`[i, j)` denotes a valid range, `p` and `q2` denote valid constant
+iterators to `a`, `q` and `q1` denote valid dereferenceable constant
+iterators to `a`, `r` denotes a valid dereferenceable iterator to `a`,
+`[q1, q2)` denotes a valid range in `a`, `il` denotes a value of type
+`initializer_list<value_type>`, `t` denotes a value of type
+`X::value_type`, `k` denotes a value of type `key_type`, `hf` denotes a
+possibly const value of type `hasher`, `eq` denotes a possibly const
+value of type `key_equal`, `n` denotes a value of type `size_type`, `z`
+denotes a value of type `float`, and `nh` denotes a non-const rvalue of
+type `X::node_type`.
 Two unordered containers `a` and `b` compare equal if
 `a.size() == b.size()` and, for every equivalent-key group \[`Ea1`,
 `Ea2`) obtained from `a.equal_range(Ea1)`, there exists an
 equivalent-key group \[`Eb1`, `Eb2`) obtained from `b.equal_range(Ea1)`,
 such that `is_permutation(Ea1, Ea2, Eb1, Eb2)` returns `true`. For
 `unordered_set` and `unordered_map`, the complexity of `operator==`
 (i.e., the number of calls to the `==` operator of the `value_type`, to
+the predicate returned by `key_eq()`, and to the hasher returned by
 `hash_function()`) is proportional to N in the average case and to N² in
 the worst case, where N is a.size(). For `unordered_multiset` and
 `unordered_multimap`, the complexity of `operator==` is proportional to
 $\sum E_i^2$ in the average case and to N² in the worst case, where N is
 `a.size()`, and Eᵢ is the size of the iᵗʰ equivalent-key group in `a`.
 `unordered_multiset` and `unordered_multimap` becomes proportional to N
 (but worst-case complexity remains 𝑂(N^2), e.g., for a pathologically
 bad hash function). The behavior of a program that uses `operator==` or
 `operator!=` on unordered containers is undefined unless the `Hash` and
 `Pred` function objects respectively have the same behavior for both
+containers and the equality comparison function for `Key` is a
 refinement[^1] of the partition into equivalent-key groups produced by
 `Pred`.
 The iterator types `iterator` and `const_iterator` of an unordered
 associative container are of at least the forward iterator category. For
 unordered associative containers where the key type and value type are
+the same, both `iterator` and `const_iterator` are constant iterators.
 The `insert` and `emplace` members shall not affect the validity of
 references to container elements, but may invalidate all iterators to
 the container. The `erase` members shall invalidate only iterators and
 references to the erased elements, and preserve the relative order of
 the elements that are not erased.
 The `insert` and `emplace` members shall not affect the validity of
+iterators if `(N+n) <= z * B`, where `N` is the number of elements in
+the container prior to the insert operation, `n` is the number of
+elements inserted, `B` is the container’s bucket count, and `z` is the
 container’s maximum load factor.
+The `extract` members invalidate only iterators to the removed element,
+and preserve the relative order of the elements that are not erased;
+pointers and references to the removed element remain valid. However,
+accessing the element through such pointers and references while the
+element is owned by a `node_type` is undefined behavior. References and
+pointers to an element obtained while it is owned by a `node_type` are
+invalidated if the element is successfully inserted.
+A deduction guide for an unordered associative container shall not
+participate in overload resolution if any of the following are true:
+- It has an `InputIterator` template parameter and a type that does not
+  qualify as an input iterator is deduced for that parameter.
+- It has an `Allocator` template parameter and a type that does not
+  qualify as an allocator is deduced for that parameter.
+- It has a `Hash` template parameter and an integral type or a type that
+  qualifies as an allocator is deduced for that parameter.
+- It has a `Pred` template parameter and a type that qualifies as an
+  allocator is deduced for that parameter.
 #### Exception safety guarantees <a id="unord.req.except">[[unord.req.except]]</a>
 For unordered associative containers, no `clear()` function throws an
 exception. `erase(k)` does not throw an exception unless that exception
 is thrown by the container’s `Hash` or `Pred` object (if any).
 `insert` or `emplace` function inserting a single element, the insertion
 has no effect.
 For unordered associative containers, no `swap` function throws an
 exception unless that exception is thrown by the swap of the container’s
+`Hash` or `Pred` object (if any).
 For unordered associative containers, if an exception is thrown from
 within a `rehash()` function other than by the container’s hash function
 or comparison function, the `rehash()` function has no effect.
 ## Sequence containers <a id="sequences">[[sequences]]</a>
 ### In general <a id="sequences.general">[[sequences.general]]</a>
 The headers `<array>`, `<deque>`, `<forward_list>`, `<list>`, and
+`<vector>` define class templates that meet the requirements for
 sequence containers.
+### Header `<array>` synopsis <a id="array.syn">[[array.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
+  // [array], class template array
   template <class T, size_t N> struct array;
   template <class T, size_t N>
     bool operator==(const array<T, N>& x, const array<T, N>& y);
   template <class T, size_t N>
     bool operator!=(const array<T, N>& x, const array<T, N>& y);
     constexpr T& get(array<T, N>&) noexcept;
   template <size_t I, class T, size_t N>
     constexpr T&& get(array<T, N>&&) noexcept;
   template <size_t I, class T, size_t N>
     constexpr const T& get(const array<T, N>&) noexcept;
+  template <size_t I, class T, size_t N>
+    constexpr const T&& get(const array<T, N>&&) noexcept;
 }
 ```
+### Header `<deque>` synopsis <a id="deque.syn">[[deque.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
+  // [deque], class template deque
   template <class T, class Allocator = allocator<T>> class deque;
   template <class T, class Allocator>
     bool operator==(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator>=(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
+    void swap(deque<T, Allocator>& x, deque<T, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
+  namespace pmr {
+    template <class T>
+      using deque = std::deque<T, polymorphic_allocator<T>>;
+  }
 }
 ```
+### Header `<forward_list>` synopsis <a id="forward_list.syn">[[forward_list.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
+  // [forwardlist], class template forward_list
   template <class T, class Allocator = allocator<T>> class forward_list;
   template <class T, class Allocator>
     bool operator==(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator>=(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
+    void swap(forward_list<T, Allocator>& x, forward_list<T, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
+  namespace pmr {
+    template <class T>
+      using forward_list = std::forward_list<T, polymorphic_allocator<T>>;
+  }
 }
 ```
+### Header `<list>` synopsis <a id="list.syn">[[list.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
+  // [list], class template list
   template <class T, class Allocator = allocator<T>> class list;
   template <class T, class Allocator>
     bool operator==(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator>=(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
+    void swap(list<T, Allocator>& x, list<T, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
+  namespace pmr {
+    template <class T>
+      using list = std::list<T, polymorphic_allocator<T>>;
+  }
 }
 ```
+### Header `<vector>` synopsis <a id="vector.syn">[[vector.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
+  // [vector], class template vector
   template <class T, class Allocator = allocator<T>> class vector;
   template <class T, class Allocator>
     bool operator==(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator>=(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
+    void swap(vector<T, Allocator>& x, vector<T, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
+  // [vector.bool], class vector<bool>
   template <class Allocator> class vector<bool, Allocator>;
   // hash support
   template <class T> struct hash;
   template <class Allocator> struct hash<vector<bool, Allocator>>;
+  namespace pmr {
+    template <class T>
+      using vector = std::vector<T, polymorphic_allocator<T>>;
+  }
 }
 ```
 ### Class template `array` <a id="array">[[array]]</a>
 #### Class template `array` overview <a id="array.overview">[[array.overview]]</a>
 The header `<array>` defines a class template for storing fixed-size
+sequences of objects. An `array` is a contiguous container (
+[[container.requirements.general]]). An instance of `array<T, N>` stores
+`N` elements of type `T`, so that `size() == N` is an invariant.
+An `array` is an aggregate ([[dcl.init.aggr]]) that can be
+list-initialized with up to `N` elements whose types are convertible to
+`T`.
 An `array` satisfies all of the requirements of a container and of a
 reversible container ([[container.requirements]]), except that a
 default constructed `array` object is not empty and that `swap` does not
 have constant complexity. An `array` satisfies some of the requirements
 ``` cpp
 namespace std {
   template <class T, size_t N>
   struct array {
     //  types:
+ using value_type             = T;
+ using pointer                = T*;
+ using const_pointer          = const T*;
+ using reference              = T&;
+ using const_reference        = const T&;
+ using size_type              = size_t;
+ using difference_type        = ptrdiff_t;
+ using iterator               = implementation-defined  // type of array::iterator; // see [container.requirements]
+ using const_iterator         = implementation-defined  // type of array::const_iterator; // see [container.requirements]
+ using reverse_iterator       = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
     // no explicit construct/copy/destroy for aggregate type
     void fill(const T& u);
+    void swap(array&) noexcept(is_nothrow_swappable_v<T>);
     // iterators:
+ constexpr iterator               begin() noexcept;
+ constexpr const_iterator         begin() const noexcept;
+ constexpr iterator               end() noexcept;
+ constexpr const_iterator         end() const noexcept;
+ constexpr reverse_iterator       rbegin() noexcept;
+ constexpr const_reverse_iterator rbegin() const noexcept;
+ constexpr reverse_iterator       rend() noexcept;
+ constexpr const_reverse_iterator rend() const noexcept;
+ constexpr const_iterator         cbegin() const noexcept;
+ constexpr const_iterator         cend() const noexcept;
+ constexpr const_reverse_iterator crbegin() const noexcept;
+ constexpr const_reverse_iterator crend() const noexcept;
     // capacity:
+    constexpr bool      empty() const noexcept;
     constexpr size_type size() const noexcept;
     constexpr size_type max_size() const noexcept;
     // element access:
+ constexpr reference operator[](size_type n);
     constexpr const_reference operator[](size_type n) const;
+ constexpr reference at(size_type n);
     constexpr const_reference at(size_type n) const;
+ constexpr reference front();
     constexpr const_reference front() const;
+ constexpr reference back();
     constexpr const_reference back() const;
+ constexpr T *       data() noexcept;
+ constexpr const T * data() const noexcept;
   };
+  template<class T, class... U>
+    array(T, U...) -> array<T, 1 + sizeof...(U)>;
 }
 ```
 #### `array` constructors, copy, and assignment <a id="array.cons">[[array.cons]]</a>
 The conditions for an aggregate ([[dcl.init.aggr]]) shall be met. Class
 `array` relies on the implicitly-declared special member functions (
 [[class.ctor]], [[class.dtor]], and [[class.copy]]) to conform to the
 to the requirements specified in the container requirements table, the
 implicit move constructor and move assignment operator for `array`
 require that `T` be `MoveConstructible` or `MoveAssignable`,
 respectively.
+``` cpp
+template<class T, class... U>
+  array(T, U...) -> array<T, 1 + sizeof...(U)>;
+```
+*Requires:* `(is_same_v<T, U> && ...)` is `true`. Otherwise the program
+is ill-formed.
 #### `array` specialized algorithms <a id="array.special">[[array.special]]</a>
 ``` cpp
+template <class T, size_t N>
+  void swap(array<T, N>& x, array<T, N>& y) noexcept(noexcept(x.swap(y)));
 ```
+*Remarks:* This function shall not participate in overload resolution
+unless `N == 0` or `is_swappable_v<T>` is `true`.
+*Effects:* As if by `x.swap(y)`.
 *Complexity:* Linear in `N`.
 #### `array::size` <a id="array.size">[[array.size]]</a>
 ``` cpp
 template <class T, size_t N> constexpr size_type array<T, N>::size() const noexcept;
 ```
+*Returns:* `N`.
 #### `array::data` <a id="array.data">[[array.data]]</a>
 ``` cpp
+constexpr T* data() noexcept;
+constexpr const T* data() const noexcept;
 ```
+*Returns:* A pointer such that `data() == addressof(front())`, and
+\[`data()`, `data() + size()`) is a valid range.
 #### `array::fill` <a id="array.fill">[[array.fill]]</a>
 ``` cpp
 void fill(const T& u);
 ```
+*Effects:* As if by `fill_n(begin(), N, u)`.
 #### `array::swap` <a id="array.swap">[[array.swap]]</a>
 ``` cpp
+void swap(array& y) noexcept(is_nothrow_swappable_v<T>);
 ```
+*Effects:* Equivalent to `swap_ranges(begin(), end(), y.begin())`.
+[*Note 1*: Unlike the `swap` function for other containers,
+`array::swap` takes linear time, may exit via an exception, and does not
+cause iterators to become associated with the other
+container. — *end note*]
 #### Zero sized arrays <a id="array.zero">[[array.zero]]</a>
 `array` shall provide support for the special case `N == 0`.
 return value of `data()` is unspecified.
 The effect of calling `front()` or `back()` for a zero-sized array is
 undefined.
+Member function `swap()` shall have a non-throwing exception
+specification.
 #### Tuple interface to class template `array` <a id="array.tuple">[[array.tuple]]</a>
 ``` cpp
 template <class T, size_t N>
+ struct tuple_size<array<T, N>> : integral_constant<size_t, N> { };
 ```
 ``` cpp
 tuple_element<I, array<T, N>>::type
 ```
 *Value:* The type T.
 ``` cpp
 template <size_t I, class T, size_t N>
   constexpr T& get(array<T, N>& a) noexcept;
 template <size_t I, class T, size_t N>
   constexpr T&& get(array<T, N>&& a) noexcept;
 template <size_t I, class T, size_t N>
   constexpr const T& get(const array<T, N>& a) noexcept;
+template <size_t I, class T, size_t N>
+  constexpr const T&& get(const array<T, N>&& a) noexcept;
 ```
 *Requires:* `I < N`. The program is ill-formed if `I` is out of bounds.
+*Returns:* A reference to the `I`th element of `a`, where indexing is
+zero-based.
 ### Class template `deque` <a id="deque">[[deque]]</a>
 #### Class template `deque` overview <a id="deque.overview">[[deque.overview]]</a>
+A `deque` is a sequence container that supports random access iterators
+([[random.access.iterators]]). In addition, it supports constant time
 insert and erase operations at the beginning or the end; insert and
 erase in the middle take linear time. That is, a deque is especially
+optimized for pushing and popping elements at the beginning and end.
+Storage management is handled automatically.
 A `deque` satisfies all of the requirements of a container, of a
 reversible container (given in tables in  [[container.requirements]]),
 of a sequence container, including the optional sequence container
 requirements ([[sequence.reqmts]]), and of an allocator-aware container
 namespace std {
   template <class T, class Allocator = allocator<T>>
   class deque {
   public:
     // types:
+ using value_type             = T;
+ using allocator_type         = Allocator;
+ using pointer = typename allocator_traits<Allocator>::pointer;
+ using const_pointer          = typename allocator_traits<Allocator>::const_pointer;
+ using reference              = value_type&;
+ using const_reference        = const value_type&;
+ using size_type              = implementation-defined; // see [container.requirements]
+ using difference_type        = implementation-defined; // see [container.requirements]
+ using iterator               = implementation-defined  // type of deque::iterator; // see [container.requirements]
+ using const_iterator         = implementation-defined  // type of deque::const_iterator; // see [container.requirements]
+ using reverse_iterator       = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+    // [deque.cons], construct/copy/destroy
     deque() : deque(Allocator()) { }
     explicit deque(const Allocator&);
     explicit deque(size_type n, const Allocator& = Allocator());
     deque(size_type n, const T& value, const Allocator& = Allocator());
     template <class InputIterator>
     deque(deque&&, const Allocator&);
     deque(initializer_list<T>, const Allocator& = Allocator());
     ~deque();
     deque& operator=(const deque& x);
+    deque& operator=(deque&& x)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value);
     deque& operator=(initializer_list<T>);
     template <class InputIterator>
       void assign(InputIterator first, InputIterator last);
     void assign(size_type n, const T& t);
     void assign(initializer_list<T>);
     const_iterator         cbegin() const noexcept;
     const_iterator         cend() const noexcept;
     const_reverse_iterator crbegin() const noexcept;
     const_reverse_iterator crend() const noexcept;
+    // [deque.capacity], capacity
+    bool      empty() const noexcept;
     size_type size() const noexcept;
     size_type max_size() const noexcept;
     void      resize(size_type sz);
     void      resize(size_type sz, const T& c);
     void      shrink_to_fit();
     // element access:
     reference       operator[](size_type n);
     const_reference operator[](size_type n) const;
     reference       at(size_type n);
     reference       front();
     const_reference front() const;
     reference       back();
     const_reference back() const;
+    // [deque.modifiers], modifiers
+    template <class... Args> reference emplace_front(Args&&... args);
+    template <class... Args> reference emplace_back(Args&&... args);
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);
     void push_front(const T& x);
     void push_front(T&& x);
     void push_back(const T& x);
     void pop_front();
     void pop_back();
     iterator erase(const_iterator position);
     iterator erase(const_iterator first, const_iterator last);
+    void     swap(deque&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value);
     void     clear() noexcept;
   };
+  template<class InputIterator,
+           class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+    deque(InputIterator, InputIterator, Allocator = Allocator())
+      -> deque<typename iterator_traits<InputIterator>::value_type, Allocator>;
   template <class T, class Allocator>
     bool operator==(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
   template <class T, class Allocator>
     bool operator>=(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
+  // [deque.special], specialized algorithms
   template <class T, class Allocator>
+    void swap(deque<T, Allocator>& x, deque<T, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
 #### `deque` constructors, copy, and assignment <a id="deque.cons">[[deque.cons]]</a>
 *Requires:* `T` shall be `DefaultInsertable` into `*this`.
 *Complexity:* Linear in `n`.
 ``` cpp
+deque(size_type n, const T& value, const Allocator& = Allocator());
 ```
 *Effects:* Constructs a `deque` with `n` copies of `value`, using the
 specified allocator.
 *Complexity:* Linear in `n`.
 ``` cpp
 template <class InputIterator>
+  deque(InputIterator first, InputIterator last, const Allocator& = Allocator());
 ```
 *Effects:* Constructs a `deque` equal to the range \[`first`, `last`),
 using the specified allocator.
 ``` cpp
 void resize(size_type sz);
 ```
+*Effects:* If `sz < size()`, erases the last `size() - sz` elements from
+the sequence. Otherwise, appends `sz - size()` default-inserted elements
+to the sequence.
 *Requires:* `T` shall be `MoveInsertable` and `DefaultInsertable` into
 `*this`.
 ``` cpp
 void resize(size_type sz, const T& c);
 ```
+*Effects:* If `sz < size()`, erases the last `size() - sz` elements from
+the sequence. Otherwise, appends `sz - size()` copies of `c` to the
+sequence.
 *Requires:* `T` shall be `CopyInsertable` into `*this`.
 ``` cpp
 void shrink_to_fit();
 ```
 *Requires:* `T` shall be `MoveInsertable` into `*this`.
+*Effects:* `shrink_to_fit` is a non-binding request to reduce memory use
+but does not change the size of the sequence.
+[*Note 1*: The request is non-binding to allow latitude for
+implementation-specific optimizations. — *end note*]
+If an exception is thrown other than by the move constructor of a
+non-`CopyInsertable` `T` there are no effects.
 *Complexity:* Linear in the size of the sequence.
+*Remarks:* `shrink_to_fit` invalidates all the references, pointers, and
+iterators referring to the elements in the sequence as well as the
+past-the-end iterator.
 #### `deque` modifiers <a id="deque.modifiers">[[deque.modifiers]]</a>
 ``` cpp
 iterator insert(const_iterator position, const T& x);
 template <class InputIterator>
   iterator insert(const_iterator position,
                   InputIterator first, InputIterator last);
 iterator insert(const_iterator position, initializer_list<T>);
+template <class... Args> reference emplace_front(Args&&... args);
+template <class... Args> reference emplace_back(Args&&... args);
 template <class... Args> iterator emplace(const_iterator position, Args&&... args);
 void push_front(const T& x);
 void push_front(T&& x);
 void push_back(const T& x);
 void push_back(T&& x);
 constructor of `T`.
 ``` cpp
 iterator erase(const_iterator position);
 iterator erase(const_iterator first, const_iterator last);
+void pop_front();
+void pop_back();
 ```
 *Effects:* An erase operation that erases the last element of a deque
 invalidates only the past-the-end iterator and all iterators and
 references to the erased elements. An erase operation that erases the
+first element of a deque but not the last element invalidates only
+iterators and references to the erased elements. An erase operation that
+erases neither the first element nor the last element of a deque
+invalidates the past-the-end iterator and all iterators and references
+to all the elements of the deque.
+[*Note 1*: `pop_front` and `pop_back` are erase
+operations. — *end note*]
+*Complexity:* The number of calls to the destructor of `T` is the same
+as the number of elements erased, but the number of calls to the
+assignment operator of `T` is no more than the lesser of the number of
+elements before the erased elements and the number of elements after the
+erased elements.
 *Throws:* Nothing unless an exception is thrown by the copy constructor,
 move constructor, assignment operator, or move assignment operator of
 `T`.
 #### `deque` specialized algorithms <a id="deque.special">[[deque.special]]</a>
 ``` cpp
 template <class T, class Allocator>
+  void swap(deque<T, Allocator>& x, deque<T, Allocator>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class template `forward_list` <a id="forwardlist">[[forwardlist]]</a>
 #### Class template `forward_list` overview <a id="forwardlist.overview">[[forwardlist.overview]]</a>
 A `forward_list` is a container that supports forward iterators and
 allows constant time insert and erase operations anywhere within the
 sequence, with storage management handled automatically. Fast random
+access to list elements is not supported.
+[*Note 1*: It is intended that `forward_list` have zero space or time
+overhead relative to a hand-written C-style singly linked list. Features
+that would conflict with that goal have been omitted. — *end note*]
 A `forward_list` satisfies all of the requirements of a container
 (Table  [[tab:containers.container.requirements]]), except that the
 `size()` member function is not provided and `operator==` has linear
 complexity. A `forward_list` also satisfies all of the requirements for
 optional container requirements (Table
 [[tab:containers.sequence.optional]]). Descriptions are provided here
 only for operations on `forward_list` that are not described in that
 table or for operations where there is additional semantic information.
+[*Note 2*: Modifying any list requires access to the element preceding
+the first element of interest, but in a `forward_list` there is no
+constant-time way to access a preceding element. For this reason, ranges
+that are modified, such as those supplied to `erase` and `splice`, must
+be open at the beginning. — *end note*]
 ``` cpp
 namespace std {
   template <class T, class Allocator = allocator<T>>
   class forward_list {
   public:
     // types:
+ using value_type      = T;
+ using allocator_type  = Allocator;
+ using pointer         = typename allocator_traits<Allocator>::pointer;
+ using const_pointer   = typename allocator_traits<Allocator>::const_pointer;
+ using reference       = value_type&;
+ using const_reference = const value_type&;
+ using size_type       = implementation-defined; // see [container.requirements]
+ using difference_type = implementation-defined; // see [container.requirements]
+ using iterator        = implementation-defined  // type of forward_list::iterator; // see [container.requirements]
+ using const_iterator  = implementation-defined  // type of forward_list::const_iterator; // see [container.requirements]
+    // [forwardlist.cons], construct/copy/destroy
     forward_list() : forward_list(Allocator()) { }
     explicit forward_list(const Allocator&);
     explicit forward_list(size_type n, const Allocator& = Allocator());
     forward_list(size_type n, const T& value,
                  const Allocator& = Allocator());
     forward_list(const forward_list& x, const Allocator&);
     forward_list(forward_list&& x, const Allocator&);
     forward_list(initializer_list<T>, const Allocator& = Allocator());
     ~forward_list();
     forward_list& operator=(const forward_list& x);
+    forward_list& operator=(forward_list&& x)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value);
     forward_list& operator=(initializer_list<T>);
     template <class InputIterator>
       void assign(InputIterator first, InputIterator last);
     void assign(size_type n, const T& t);
     void assign(initializer_list<T>);
     allocator_type get_allocator() const noexcept;
+    // [forwardlist.iter], iterators
     iterator before_begin() noexcept;
     const_iterator before_begin() const noexcept;
     iterator begin() noexcept;
     const_iterator begin() const noexcept;
     iterator end() noexcept;
     // capacity:
     bool      empty() const noexcept;
     size_type max_size() const noexcept;
+    // [forwardlist.access], element access
     reference front();
     const_reference front() const;
+    // [forwardlist.modifiers], modifiers
+    template <class... Args> reference emplace_front(Args&&... args);
     void push_front(const T& x);
     void push_front(T&& x);
     void pop_front();
     template <class... Args> iterator emplace_after(const_iterator position, Args&&... args);
       iterator insert_after(const_iterator position, InputIterator first, InputIterator last);
     iterator insert_after(const_iterator position, initializer_list<T> il);
     iterator erase_after(const_iterator position);
     iterator erase_after(const_iterator position, const_iterator last);
+    void swap(forward_list&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value);
     void resize(size_type sz);
     void resize(size_type sz, const value_type& c);
     void clear() noexcept;
+    // [forwardlist.ops], forward_list operations
     void splice_after(const_iterator position, forward_list& x);
     void splice_after(const_iterator position, forward_list&& x);
     void splice_after(const_iterator position, forward_list& x,
                       const_iterator i);
     void splice_after(const_iterator position, forward_list&& x,
     template <class Compare> void sort(Compare comp);
     void reverse() noexcept;
   };
+ template<class InputIterator,
+           class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+    forward_list(InputIterator, InputIterator, Allocator = Allocator())
+      -> forward_list<typename iterator_traits<InputIterator>::value_type, Allocator>;
   template <class T, class Allocator>
     bool operator==(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
   template <class T, class Allocator>
     bool operator>=(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const forward_list<T, Allocator>& x, const forward_list<T, Allocator>& y);
+  // [forwardlist.spec], specialized algorithms
   template <class T, class Allocator>
+    void swap(forward_list<T, Allocator>& x, forward_list<T, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
+An incomplete type `T` may be used when instantiating `forward_list` if
+the allocator satisfies the allocator completeness requirements (
+[[allocator.requirements.completeness]]). `T` shall be complete before
+any member of the resulting specialization of `forward_list` is
+referenced.
 #### `forward_list` constructors, copy, assignment <a id="forwardlist.cons">[[forwardlist.cons]]</a>
 ``` cpp
 explicit forward_list(const Allocator&);
 ```
 to the copy or move constructor of `T` is exactly equal to `n`. Erasing
 `n` elements from a `forward_list` is linear in `n` and the number of
 calls to the destructor of type `T` is exactly equal to `n`.
 ``` cpp
+template <class... Args> reference emplace_front(Args&&... args);
 ```
 *Effects:* Inserts an object of type `value_type` constructed with
 `value_type(std::forward<Args>(args)...)` at the beginning of the list.
 ``` cpp
 void pop_front();
 ```
+*Effects:* As if by `erase_after(before_begin())`.
 ``` cpp
 iterator insert_after(const_iterator position, const T& x);
 iterator insert_after(const_iterator position, T&& x);
 ```
 void resize(size_type sz, const value_type& c);
 ```
 *Effects:* If `sz < distance(begin(), end())`, erases the last
 `distance(begin(), end()) - sz` elements from the list. Otherwise,
+inserts `sz - distance(begin(), end())` copies of `c` at the end of the
+list.
 *Requires:* `T` shall be `CopyInsertable` into `*this`.
 ``` cpp
 void clear() noexcept;
 the moved elements will continue to refer to their elements, but they
 now behave as iterators into `*this`, not into `x`.
 *Throws:* Nothing.
+*Complexity:* 𝑂(`distance(x.begin(), x.end())`)
 ``` cpp
 void splice_after(const_iterator position, forward_list& x, const_iterator i);
 void splice_after(const_iterator position, forward_list&& x, const_iterator i);
 ```
 the moved elements of `x` now refer to those same elements but as
 members of `*this`. Iterators referring to the moved elements will
 continue to refer to their elements, but they now behave as iterators
 into `*this`, not into `x`.
+*Complexity:* 𝑂(`distance(first, last)`)
 ``` cpp
 void remove(const T& value);
 template <class Predicate> void remove_if(Predicate pred);
 ```
 *Effects:* Erases all the elements in the list referred by a list
 iterator `i` for which the following conditions hold: `*i == value` (for
+`remove()`), `pred(*i)` is `true` (for `remove_if()`). Invalidates only
 the iterators and references to the erased elements.
 *Throws:* Nothing unless an exception is thrown by the equality
 comparison or the predicate.
 but as members of `*this`. Iterators referring to the moved elements
 will continue to refer to their elements, but they now behave as
 iterators into `*this`, not into `x`.
 *Remarks:* Stable ([[algorithm.stable]]). The behavior is undefined if
+`get_allocator() != x.get_allocator()`.
 *Complexity:* At most
 `distance(begin(), end()) + distance(x.begin(), x.end()) - 1`
 comparisons.
 *Requires:* `operator<` (for the version with no arguments) or `comp`
 (for the version with a comparison argument) defines a strict weak
 ordering ([[alg.sorting]]).
 *Effects:* Sorts the list according to the `operator<` or the `comp`
+function object. If an exception is thrown, the order of the elements in
 `*this` is unspecified. Does not affect the validity of iterators and
 references.
 *Remarks:* Stable ([[algorithm.stable]]).
 #### `forward_list` specialized algorithms <a id="forwardlist.spec">[[forwardlist.spec]]</a>
 ``` cpp
 template <class T, class Allocator>
+  void swap(forward_list<T, Allocator>& x, forward_list<T, Allocator>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class template `list` <a id="list">[[list]]</a>
 #### Class template `list` overview <a id="list.overview">[[list.overview]]</a>
 namespace std {
   template <class T, class Allocator = allocator<T>>
   class list {
   public:
     // types:
+ using value_type             = T;
+ using allocator_type         = Allocator;
+ using pointer = typename allocator_traits<Allocator>::pointer;
+ using const_pointer          = typename allocator_traits<Allocator>::const_pointer;
+ using reference              = value_type&;
+ using const_reference        = const value_type&;
+ using size_type              = implementation-defined; // see [container.requirements]
+ using difference_type        = implementation-defined; // see [container.requirements]
+ using iterator               = implementation-defined  // type of list::iterator; // see [container.requirements]
+ using const_iterator         = implementation-defined  // type of list::const_iterator; // see [container.requirements]
+ using reverse_iterator       = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+    // [list.cons], construct/copy/destroy
     list() : list(Allocator()) { }
     explicit list(const Allocator&);
     explicit list(size_type n, const Allocator& = Allocator());
     list(size_type n, const T& value, const Allocator& = Allocator());
     template <class InputIterator>
     list(const list&, const Allocator&);
     list(list&&, const Allocator&);
     list(initializer_list<T>, const Allocator& = Allocator());
     ~list();
     list& operator=(const list& x);
+    list& operator=(list&& x)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value);
     list& operator=(initializer_list<T>);
     template <class InputIterator>
       void assign(InputIterator first, InputIterator last);
     void assign(size_type n, const T& t);
     void assign(initializer_list<T>);
     const_iterator         cbegin() const noexcept;
     const_iterator         cend() const noexcept;
     const_reverse_iterator crbegin() const noexcept;
     const_reverse_iterator crend() const noexcept;
+    // [list.capacity], capacity
     bool      empty() const noexcept;
     size_type size() const noexcept;
     size_type max_size() const noexcept;
     void      resize(size_type sz);
     void      resize(size_type sz, const T& c);
     reference       front();
     const_reference front() const;
     reference       back();
     const_reference back() const;
+    // [list.modifiers], modifiers
+    template <class... Args> reference emplace_front(Args&&... args);
+ template <class... Args> reference emplace_back(Args&&... args);
     void push_front(const T& x);
     void push_front(T&& x);
+    void pop_front();
     void push_back(const T& x);
     void push_back(T&& x);
     void pop_back();
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);
                       InputIterator last);
     iterator insert(const_iterator position, initializer_list<T> il);
     iterator erase(const_iterator position);
     iterator erase(const_iterator position, const_iterator last);
+    void     swap(list&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value);
     void     clear() noexcept;
+    // [list.ops], list operations
     void splice(const_iterator position, list& x);
     void splice(const_iterator position, list&& x);
     void splice(const_iterator position, list& x, const_iterator i);
     void splice(const_iterator position, list&& x, const_iterator i);
     void splice(const_iterator position, list& x,
     template <class Compare> void sort(Compare comp);
     void reverse() noexcept;
   };
+  template<class InputIterator,
+           class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+    list(InputIterator, InputIterator, Allocator = Allocator())
+      -> list<typename iterator_traits<InputIterator>::value_type, Allocator>;
   template <class T, class Allocator>
     bool operator==(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
   template <class T, class Allocator>
     bool operator>=(const list<T, Allocator>& x, const list<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const list<T, Allocator>& x, const list<T, Allocator>& y);
+  // [list.special], specialized algorithms
   template <class T, class Allocator>
+    void swap(list<T, Allocator>& x, list<T, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
+An incomplete type `T` may be used when instantiating `list` if the
+allocator satisfies the allocator completeness requirements (
+[[allocator.requirements.completeness]]). `T` shall be complete before
+any member of the resulting specialization of `list` is referenced.
 #### `list` constructors, copy, and assignment <a id="list.cons">[[list.cons]]</a>
 ``` cpp
 explicit list(const Allocator&);
 ```
 *Requires:* `T` shall be `DefaultInsertable` into `*this`.
 *Complexity:* Linear in `n`.
 ``` cpp
+list(size_type n, const T& value, const Allocator& = Allocator());
 ```
 *Effects:* Constructs a `list` with `n` copies of `value`, using the
 specified allocator.
 *Complexity:* Linear in `n`.
 ``` cpp
 template <class InputIterator>
+ list(InputIterator first, InputIterator last, const Allocator& = Allocator());
 ```
 *Effects:* Constructs a `list` equal to the range \[`first`, `last`).
 *Complexity:* Linear in `distance(first, last)`.
 ``` cpp
 void resize(size_type sz);
 ```
 *Effects:* If `size() < sz`, appends `sz - size()` default-inserted
+elements to the sequence. If `sz <= size()`, equivalent to:
 ``` cpp
 list<T>::iterator it = begin();
 advance(it, sz);
 erase(it, end());
 ``` cpp
 void resize(size_type sz, const T& c);
 ```
+*Effects:* As if by:
 ``` cpp
 if (sz > size())
   insert(end(), sz-size(), c);
 else if (sz < size()) {
 template <class InputIterator>
   iterator insert(const_iterator position, InputIterator first,
                   InputIterator last);
 iterator insert(const_iterator position, initializer_list<T>);
+template <class... Args> reference emplace_front(Args&&... args);
+template <class... Args> reference emplace_back(Args&&... args);
 template <class... Args> iterator emplace(const_iterator position, Args&&... args);
 void push_front(const T& x);
 void push_front(T&& x);
 void push_back(const T& x);
 void push_back(T&& x);
 ``` cpp
 void splice(const_iterator position, list& x, const_iterator i);
 void splice(const_iterator position, list&& x, const_iterator i);
 ```
+*Requires:* `i` is a valid dereferenceable iterator of `x`.
 *Effects:* Inserts an element pointed to by `i` from list `x` before
 `position` and removes the element from `x`. The result is unchanged if
 `position == i` or `position == ++i`. Pointers and references to `*i`
 continue to refer to this same element but as a member of `*this`.
 Iterators to `*i` (including `i` itself) continue to refer to the same
 element, but now behave as iterators into `*this`, not into `x`.
 *Throws:* Nothing.
 *Complexity:* Constant time.
 ``` cpp
             const_iterator last);
 void splice(const_iterator position, list&& x, const_iterator first,
             const_iterator last);
 ```
+*Requires:* `[first, last)` is a valid range in `x`. The program has
+undefined behavior if `position` is an iterator in the range \[`first`,
+`last`).
 *Effects:* Inserts elements in the range \[`first`, `last`) before
+`position` and removes the elements from `x`. Pointers and references to
+the moved elements of `x` now refer to those same elements but as
+members of `*this`. Iterators referring to the moved elements will
+continue to refer to their elements, but they now behave as iterators
+into `*this`, not into `x`.
 *Throws:* Nothing.
 *Complexity:* Constant time if `&x == this`; otherwise, linear time.
 *Effects:* If `(&x == this)` does nothing; otherwise, merges the two
 sorted ranges `[begin(), end())` and `[x.begin(), x.end())`. The result
 is a range in which the elements will be sorted in non-decreasing order
 according to the ordering defined by `comp`; that is, for every iterator
 `i`, in the range other than the first, the condition
+`comp(*i, *(i - 1))` will be `false`. Pointers and references to the
+moved elements of `x` now refer to those same elements but as members of
 `*this`. Iterators referring to the moved elements will continue to
 refer to their elements, but they now behave as iterators into `*this`,
 not into `x`.
 *Remarks:* Stable ([[algorithm.stable]]). If `(&x != this)` the range
 `[x.begin(), x.end())` is empty after the merge. No elements are copied
 by this operation. The behavior is undefined if
+`get_allocator() != x.get_allocator()`.
 *Complexity:* At most `size() + x.size() - 1` applications of `comp` if
 `(&x != this)`; otherwise, no applications of `comp` are performed. If
 an exception is thrown other than by a comparison there are no effects.
 *Requires:* `operator<` (for the first version) or `comp` (for the
 second version) shall define a strict weak ordering ([[alg.sorting]]).
 *Effects:* Sorts the list according to the `operator<` or a `Compare`
+function object. If an exception is thrown, the order of the elements in
+`*this` is unspecified. Does not affect the validity of iterators and
 references.
 *Remarks:* Stable ([[algorithm.stable]]).
+*Complexity:* Approximately N log N comparisons, where `N == size()`.
 #### `list` specialized algorithms <a id="list.special">[[list.special]]</a>
 ``` cpp
 template <class T, class Allocator>
+  void swap(list<T, Allocator>& x, list<T, Allocator>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class template `vector` <a id="vector">[[vector]]</a>
 #### Class template `vector` overview <a id="vector.overview">[[vector.overview]]</a>
+A `vector` is a sequence container that supports (amortized) constant
+time insert and erase operations at the end; insert and erase in the
+middle take linear time. Storage management is handled automatically,
+though hints can be given to improve efficiency.
 A `vector` satisfies all of the requirements of a container and of a
 reversible container (given in two tables in
 [[container.requirements]]), of a sequence container, including most of
+the optional sequence container requirements ([[sequence.reqmts]]), of
+an allocator-aware container (Table  [[tab:containers.allocatoraware]]),
+and, for an element type other than `bool`, of a contiguous container (
+[[container.requirements.general]]). The exceptions are the
+`push_front`, `pop_front`, and `emplace_front` member functions, which
+are not provided. Descriptions are provided here only for operations on
+`vector` that are not described in one of these tables or for operations
+where there is additional semantic information.
 ``` cpp
 namespace std {
   template <class T, class Allocator = allocator<T>>
   class vector {
   public:
     // types:
+ using value_type             = T;
+ using allocator_type         = Allocator;
+ using pointer = typename allocator_traits<Allocator>::pointer;
+ using const_pointer          = typename allocator_traits<Allocator>::const_pointer;
+ using reference              = value_type&;
+ using const_reference        = const value_type&;
+ using size_type              = implementation-defined; // see [container.requirements]
+ using difference_type        = implementation-defined; // see [container.requirements]
+ using iterator               = implementation-defined  // type of vector::iterator; // see [container.requirements]
+ using const_iterator         = implementation-defined  // type of vector::const_iterator; // see [container.requirements]
+ using reverse_iterator       = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+    // [vector.cons], construct/copy/destroy
+    vector() noexcept(noexcept(Allocator())) : vector(Allocator()) { }
+    explicit vector(const Allocator&) noexcept;
     explicit vector(size_type n, const Allocator& = Allocator());
     vector(size_type n, const T& value, const Allocator& = Allocator());
     template <class InputIterator>
+      vector(InputIterator first, InputIterator last, const Allocator& = Allocator());
     vector(const vector& x);
+    vector(vector&&) noexcept;
     vector(const vector&, const Allocator&);
     vector(vector&&, const Allocator&);
     vector(initializer_list<T>, const Allocator& = Allocator());
     ~vector();
     vector& operator=(const vector& x);
+    vector& operator=(vector&& x)
+      noexcept(allocator_traits<Allocator>::propagate_on_container_move_assignment::value ||
+               allocator_traits<Allocator>::is_always_equal::value);
     vector& operator=(initializer_list<T>);
     template <class InputIterator>
       void assign(InputIterator first, InputIterator last);
     void assign(size_type n, const T& u);
     void assign(initializer_list<T>);
     const_iterator         cbegin() const noexcept;
     const_iterator         cend() const noexcept;
     const_reverse_iterator crbegin() const noexcept;
     const_reverse_iterator crend() const noexcept;
+    // [vector.capacity], capacity
+    bool      empty() const noexcept;
     size_type size() const noexcept;
     size_type max_size() const noexcept;
+    size_type capacity() const noexcept;
     void      resize(size_type sz);
     void      resize(size_type sz, const T& c);
     void      reserve(size_type n);
     void      shrink_to_fit();
     // element access:
     reference       operator[](size_type n);
     // [vector.data], data access
     T*       data() noexcept;
     const T* data() const noexcept;
+    // [vector.modifiers], modifiers
+    template <class... Args> reference emplace_back(Args&&... args);
     void push_back(const T& x);
     void push_back(T&& x);
     void pop_back();
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);
     iterator insert(const_iterator position, const T& x);
     iterator insert(const_iterator position, T&& x);
     iterator insert(const_iterator position, size_type n, const T& x);
     template <class InputIterator>
+ iterator insert(const_iterator position, InputIterator first, InputIterator last);
     iterator insert(const_iterator position, initializer_list<T> il);
     iterator erase(const_iterator position);
     iterator erase(const_iterator first, const_iterator last);
+    void     swap(vector&)
+      noexcept(allocator_traits<Allocator>::propagate_on_container_swap::value ||
+               allocator_traits<Allocator>::is_always_equal::value);
     void     clear() noexcept;
   };
+  template<class InputIterator,
+           class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+    vector(InputIterator, InputIterator, Allocator = Allocator())
+      -> vector<typename iterator_traits<InputIterator>::value_type, Allocator>;
   template <class T, class Allocator>
     bool operator==(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator< (const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
   template <class T, class Allocator>
     bool operator>=(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
   template <class T, class Allocator>
     bool operator<=(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
+  // [vector.special], specialized algorithms
   template <class T, class Allocator>
+    void swap(vector<T, Allocator>& x, vector<T, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
+An incomplete type `T` may be used when instantiating `vector` if the
+allocator satisfies the allocator completeness requirements (
+[[allocator.requirements.completeness]]). `T` shall be complete before
+any member of the resulting specialization of `vector` is referenced.
 #### `vector` constructors, copy, and assignment <a id="vector.cons">[[vector.cons]]</a>
 ``` cpp
 explicit vector(const Allocator&);
 ```
 *Effects:* Constructs a `vector` equal to the range \[`first`, `last`),
 using the specified allocator.
 *Complexity:* Makes only N calls to the copy constructor of `T` (where N
 is the distance between `first` and `last`) and no reallocations if
+iterators `first` and `last` are of forward, bidirectional, or random
+access categories. It makes order `N` calls to the copy constructor of
+`T` and order log N reallocations if they are just input iterators.
 #### `vector` capacity <a id="vector.capacity">[[vector.capacity]]</a>
 ``` cpp
 size_type capacity() const noexcept;
 void shrink_to_fit();
 ```
 *Requires:* `T` shall be `MoveInsertable` into `*this`.
+*Effects:* `shrink_to_fit` is a non-binding request to reduce
+`capacity()` to `size()`.
+[*Note 1*: The request is non-binding to allow latitude for
+implementation-specific optimizations. — *end note*]
+It does not increase `capacity()`, but may reduce `capacity()` by
+causing reallocation. If an exception is thrown other than by the move
+constructor of a non-`CopyInsertable` `T` there are no effects.
 *Complexity:* Linear in the size of the sequence.
+*Remarks:* Reallocation invalidates all the references, pointers, and
+iterators referring to the elements in the sequence as well as the
+past-the-end iterator. If no reallocation happens, they remain valid.
 ``` cpp
+void swap(vector& x)
+  noexcept(allocator_traits<Allocator>::propagate_on_container_swap::value ||
+           allocator_traits<Allocator>::is_always_equal::value);
 ```
 *Effects:* Exchanges the contents and `capacity()` of `*this` with that
 of `x`.
 ``` cpp
 void resize(size_type sz);
 ```
+*Effects:* If `sz < size()`, erases the last `size() - sz` elements from
+the sequence. Otherwise, appends `sz - size()` default-inserted elements
+to the sequence.
 *Requires:* `T` shall be `MoveInsertable` and `DefaultInsertable` into
 `*this`.
 *Remarks:* If an exception is thrown other than by the move constructor
 ``` cpp
 void resize(size_type sz, const T& c);
 ```
+*Effects:* If `sz < size()`, erases the last `size() - sz` elements from
+the sequence. Otherwise, appends `sz - size()` copies of `c` to the
+sequence.
 *Requires:* `T` shall be `CopyInsertable` into `*this`.
 *Remarks:* If an exception is thrown there are no effects.
 T*         data() noexcept;
 const T*   data() const noexcept;
 ```
 *Returns:* A pointer such that \[`data()`, `data() + size()`) is a valid
+range. For a non-empty vector, `data()` `==` `addressof(front())`.
 *Complexity:* Constant time.
 #### `vector` modifiers <a id="vector.modifiers">[[vector.modifiers]]</a>
 iterator insert(const_iterator position, size_type n, const T& x);
 template <class InputIterator>
   iterator insert(const_iterator position, InputIterator first, InputIterator last);
 iterator insert(const_iterator position, initializer_list<T>);
+template <class... Args> reference emplace_back(Args&&... args);
 template <class... Args> iterator emplace(const_iterator position, Args&&... args);
 void push_back(const T& x);
 void push_back(T&& x);
 ```
 *Remarks:* Causes reallocation if the new size is greater than the old
+capacity. Reallocation invalidates all the references, pointers, and
+iterators referring to the elements in the sequence. If no reallocation
+happens, all the iterators and references before the insertion point
+remain valid. If an exception is thrown other than by the copy
+constructor, move constructor, assignment operator, or move assignment
+operator of `T` or by any `InputIterator` operation there are no
+effects. If an exception is thrown while inserting a single element at
+the end and `T` is `CopyInsertable` or
+`is_nothrow_move_constructible_v<T>` is `true`, there are no effects.
+Otherwise, if an exception is thrown by the move constructor of a
+non-`CopyInsertable` `T`, the effects are unspecified.
 *Complexity:* The complexity is linear in the number of elements
 inserted plus the distance to the end of the vector.
 ``` cpp
 iterator erase(const_iterator position);
 iterator erase(const_iterator first, const_iterator last);
+void pop_back();
 ```
 *Effects:* Invalidates iterators and references at or after the point of
 the erase.
 *Complexity:* The destructor of `T` is called the number of times equal
+to the number of the elements erased, but the assignment operator of `T`
+is called the number of times equal to the number of elements in the
+vector after the erased elements.
+*Throws:* Nothing unless an exception is thrown by the assignment
+operator or move assignment operator of `T`.
 #### `vector` specialized algorithms <a id="vector.special">[[vector.special]]</a>
 ``` cpp
 template <class T, class Allocator>
+  void swap(vector<T, Allocator>& x, vector<T, Allocator>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class `vector<bool>` <a id="vector.bool">[[vector.bool]]</a>
 To optimize space allocation, a specialization of vector for `bool`
 elements is provided:
 ``` cpp
 namespace std {
+  template <class Allocator>
+  class vector<bool, Allocator> {
   public:
     // types:
+ using value_type             = bool;
+ using allocator_type         = Allocator;
+ using pointer                = implementation-defined;
+ using const_pointer          = implementation-defined;
+ using const_reference        = bool;
+ using size_type              = implementation-defined; // see [container.requirements]
+ using difference_type        = implementation-defined; // see [container.requirements]
+ using iterator               = implementation-defined  // type of vector<bool>::iterator; // see [container.requirements]
+ using const_iterator         = implementation-defined  // type of vector<bool>::const_iterator; // see [container.requirements]
+ using reverse_iterator       = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
     // bit reference:
     class reference {
       friend class vector;
       reference() noexcept;
     const_iterator         cend() const noexcept;
     const_reverse_iterator crbegin() const noexcept;
     const_reverse_iterator crend() const noexcept;
     // capacity:
+    bool      empty() const noexcept;
     size_type size() const noexcept;
     size_type max_size() const noexcept;
+    size_type capacity() const noexcept;
     void      resize(size_type sz, bool c = false);
     void      reserve(size_type n);
     void      shrink_to_fit();
     // element access:
     reference       operator[](size_type n);
     const_reference front() const;
     reference       back();
     const_reference back() const;
     // modifiers:
+    template <class... Args> reference emplace_back(Args&&... args);
     void push_back(const bool& x);
     void pop_back();
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);
     iterator insert(const_iterator position, const bool& x);
     iterator insert(const_iterator position, size_type n, const bool& x);
 ```
 Unless described below, all operations have the same requirements and
 semantics as the primary `vector` template, except that operations
 dealing with the `bool` value type map to bit values in the container
+storage and `allocator_traits::construct` (
+[[allocator.traits.members]]) is not used to construct these values.
 There is no requirement that the data be stored as a contiguous
 allocation of `bool` values. A space-optimized representation of bits is
 recommended instead.
 `reference`
 is a class that simulates the behavior of references of a single bit in
+`vector<bool>`. The conversion function returns `true` when the bit is
 set, and `false` otherwise. The assignment operator sets the bit when
 the argument is (convertible to) `true` and clears it otherwise. `flip`
 reverses the state of the bit.
 ``` cpp
 ``` cpp
 static void swap(reference x, reference y) noexcept;
 ```
+*Effects:* Exchanges the contents of `x` and `y` as if by:
 ``` cpp
 bool b = x;
 x = y;
 y = b;
 ``` cpp
 template <class Allocator> struct hash<vector<bool, Allocator>>;
 ```
+The specialization is enabled ([[unord.hash]]).
 ## Associative containers <a id="associative">[[associative]]</a>
 ### In general <a id="associative.general">[[associative.general]]</a>
 The header `<map>` defines the class templates `map` and `multimap`; the
 header `<set>` defines the class templates `set` and `multiset`.
+The following exposition-only alias templates may appear in deduction
+guides for associative containers:
+``` cpp
+template<class InputIterator>
+  using iter_key_t = remove_const_t<
+    typename iterator_traits<InputIterator>::value_type::first_type>; // exposition only
+template<class InputIterator>
+  using iter_val_t
+    = typename iterator_traits<InputIterator>::value_type::second_type; // exposition only
+template<class InputIterator>
+  using iter_to_alloc_t
+    = pair<add_const_t<typename iterator_traits<InputIterator>::value_type::first_type>,
+           typename iterator_traits<InputIterator>::value_type::second_type>; // exposition only
+```
 ### Header `<map>` synopsis <a id="associative.map.syn">[[associative.map.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
+  // [map], class template map
   template <class Key, class T, class Compare = less<Key>,
             class Allocator = allocator<pair<const Key, T>>>
     class map;
   template <class Key, class T, class Compare, class Allocator>
     bool operator==(const map<Key, T, Compare, Allocator>& x,
   template <class Key, class T, class Compare, class Allocator>
     bool operator<=(const map<Key, T, Compare, Allocator>& x,
                     const map<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     void swap(map<Key, T, Compare, Allocator>& x,
+              map<Key, T, Compare, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
+  // [multimap], class template multimap
   template <class Key, class T, class Compare = less<Key>,
             class Allocator = allocator<pair<const Key, T>>>
     class multimap;
   template <class Key, class T, class Compare, class Allocator>
     bool operator==(const multimap<Key, T, Compare, Allocator>& x,
   template <class Key, class T, class Compare, class Allocator>
     bool operator<=(const multimap<Key, T, Compare, Allocator>& x,
                     const multimap<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     void swap(multimap<Key, T, Compare, Allocator>& x,
+              multimap<Key, T, Compare, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
+  namespace pmr {
+    template <class Key, class T, class Compare = less<Key>>
+      using map = std::map<Key, T, Compare,
+                           polymorphic_allocator<pair<const Key, T>>>;
+    template <class Key, class T, class Compare = less<Key>>
+      using multimap = std::multimap<Key, T, Compare,
+                                     polymorphic_allocator<pair<const Key, T>>>;
+  }
 }
 ```
 ### Header `<set>` synopsis <a id="associative.set.syn">[[associative.set.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
+  // [set], class template set
   template <class Key, class Compare = less<Key>,
             class Allocator = allocator<Key>>
     class set;
   template <class Key, class Compare, class Allocator>
     bool operator==(const set<Key, Compare, Allocator>& x,
   template <class Key, class Compare, class Allocator>
     bool operator<=(const set<Key, Compare, Allocator>& x,
                     const set<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     void swap(set<Key, Compare, Allocator>& x,
+              set<Key, Compare, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
+  // [multiset], class template multiset
   template <class Key, class Compare = less<Key>,
             class Allocator = allocator<Key>>
     class multiset;
   template <class Key, class Compare, class Allocator>
     bool operator==(const multiset<Key, Compare, Allocator>& x,
   template <class Key, class Compare, class Allocator>
     bool operator<=(const multiset<Key, Compare, Allocator>& x,
                     const multiset<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     void swap(multiset<Key, Compare, Allocator>& x,
+              multiset<Key, Compare, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
+  namespace pmr {
+    template <class Key, class Compare = less<Key>>
+      using set = std::set<Key, Compare,
+                           polymorphic_allocator<Key>>;
+    template <class Key, class Compare = less<Key>>
+      using multiset = std::multiset<Key, Compare,
+                                     polymorphic_allocator<Key>>;
+  }
 }
 ```
 ### Class template `map` <a id="map">[[map]]</a>
 A `map` satisfies all of the requirements of a container, of a
 reversible container ([[container.requirements]]), of an associative
 container ([[associative.reqmts]]), and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). A `map` also provides most
+operations described in  [[associative.reqmts]] for unique keys. This
+means that a `map` supports the `a_uniq` operations in
+[[associative.reqmts]] but not the `a_eq` operations. For a `map<Key,T>`
+the `key_type` is `Key` and the `value_type` is `pair<const Key,T>`.
+Descriptions are provided here only for operations on `map` that are not
+described in one of those tables or for operations where there is
+additional semantic information.
 ``` cpp
 namespace std {
   template <class Key, class T, class Compare = less<Key>,
             class Allocator = allocator<pair<const Key, T>>>
   class map {
   public:
     // types:
+ using key_type               = Key;
+ using mapped_type            = T;
+ using value_type             = pair<const Key, T>;
+ using key_compare            = Compare;
+ using allocator_type         = Allocator;
+ using pointer                = typename allocator_traits<Allocator>::pointer;
+ using const_pointer          = typename allocator_traits<Allocator>::const_pointer;
+ using reference              = value_type&;
+ using const_reference        = const value_type&;
+ using size_type              = implementation-defined; // see [container.requirements]
+ using difference_type        = implementation-defined; // see [container.requirements]
+ using iterator               = implementation-defined  // type of map::iterator; // see [container.requirements]
+ using const_iterator         = implementation-defined  // type of map::const_iterator; // see [container.requirements]
+ using reverse_iterator       = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+    using node_type              = unspecified;
+    using insert_return_type     = INSERT_RETURN_TYPE<iterator, node_type>;
     class value_compare {
       friend class map;
     protected:
       Compare comp;
       value_compare(Compare c) : comp(c) {}
     public:
       bool operator()(const value_type& x, const value_type& y) const {
         return comp(x.first, y.first);
       }
     };
+    // [map.cons], construct/copy/destroy
     map() : map(Compare()) { }
+    explicit map(const Compare& comp, const Allocator& = Allocator());
     template <class InputIterator>
       map(InputIterator first, InputIterator last,
           const Compare& comp = Compare(), const Allocator& = Allocator());
     map(const map& x);
     map(map&& x);
         : map(first, last, Compare(), a) { }
     map(initializer_list<value_type> il, const Allocator& a)
       : map(il, Compare(), a) { }
     ~map();
     map& operator=(const map& x);
+    map& operator=(map&& x)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_move_assignable_v<Compare>);
     map& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
     // iterators:
     iterator               begin() noexcept;
     // capacity:
     bool      empty() const noexcept;
     size_type size() const noexcept;
     size_type max_size() const noexcept;
+    // [map.access], element access
     T& operator[](const key_type& x);
     T& operator[](key_type&& x);
     T&       at(const key_type& x);
     const T& at(const key_type& x) const;
+    // [map.modifiers], modifiers
     template <class... Args> pair<iterator, bool> emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     pair<iterator, bool> insert(const value_type& x);
+    pair<iterator, bool> insert(value_type&& x);
     template <class P> pair<iterator, bool> insert(P&& x);
     iterator insert(const_iterator position, const value_type& x);
+    iterator insert(const_iterator position, value_type&& x);
     template <class P>
       iterator insert(const_iterator position, P&&);
     template <class InputIterator>
       void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
+    node_type extract(const_iterator position);
+    node_type extract(const key_type& x);
+    insert_return_type insert(node_type&& nh);
+    iterator           insert(const_iterator hint, node_type&& nh);
+    template <class... Args>
+      pair<iterator, bool> try_emplace(const key_type& k, Args&&... args);
+    template <class... Args>
+      pair<iterator, bool> try_emplace(key_type&& k, Args&&... args);
+    template <class... Args>
+      iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args);
+    template <class... Args>
+      iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args);
+    template <class M>
+      pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj);
+    template <class M>
+      pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj);
+    template <class M>
+      iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj);
+    template <class M>
+      iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj);
+    iterator  erase(iterator position);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& x);
     iterator  erase(const_iterator first, const_iterator last);
+    void swap(map&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_swappable_v<Compare>);
     void      clear() noexcept;
+    template<class C2>
+      void merge(map<Key, T, C2, Allocator>& source);
+    template<class C2>
+      void merge(map<Key, T, C2, Allocator>&& source);
+    template<class C2>
+      void merge(multimap<Key, T, C2, Allocator>& source);
+    template<class C2>
+      void merge(multimap<Key, T, C2, Allocator>&& source);
     // observers:
     key_compare key_comp() const;
     value_compare value_comp() const;
     // map operations:
     iterator       upper_bound(const key_type& x);
     const_iterator upper_bound(const key_type& x) const;
     template <class K> iterator       upper_bound(const K& x);
     template <class K> const_iterator upper_bound(const K& x) const;
+    pair<iterator, iterator>               equal_range(const key_type& x);
+    pair<const_iterator, const_iterator>   equal_range(const key_type& x) const;
     template <class K>
       pair<iterator, iterator>             equal_range(const K& x);
     template <class K>
       pair<const_iterator, const_iterator> equal_range(const K& x) const;
   };
+  template<class InputIterator, class Compare = less<iter_key_t<InputIterator>>,
+           class Allocator = allocator<iter_to_alloc_t<InputIterator>>>
+    map(InputIterator, InputIterator, Compare = Compare(), Allocator = Allocator())
+      -> map<iter_key_t<InputIterator>, iter_val_t<InputIterator>, Compare, Allocator>;
+  template<class Key, class T, class Compare = less<Key>,
+           class Allocator = allocator<pair<const Key, T>>>
+    map(initializer_list<pair<const Key, T>>, Compare = Compare(), Allocator = Allocator())
+      -> map<Key, T, Compare, Allocator>;
+  template <class InputIterator, class Allocator>
+    map(InputIterator, InputIterator, Allocator)
+      -> map<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+             less<iter_key_t<InputIterator>>, Allocator>;
+  template<class Key, class T, class Allocator>
+    map(initializer_list<pair<const Key, T>>, Allocator) -> map<Key, T, less<Key>, Allocator>;
   template <class Key, class T, class Compare, class Allocator>
     bool operator==(const map<Key, T, Compare, Allocator>& x,
                     const map<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     bool operator< (const map<Key, T, Compare, Allocator>& x,
                     const map<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     bool operator<=(const map<Key, T, Compare, Allocator>& x,
                     const map<Key, T, Compare, Allocator>& y);
+  // [map.special], specialized algorithms
   template <class Key, class T, class Compare, class Allocator>
     void swap(map<Key, T, Compare, Allocator>& x,
+              map<Key, T, Compare, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
 #### `map` constructors, copy, and assignment <a id="map.cons">[[map.cons]]</a>
 ``` cpp
+explicit map(const Compare& comp, const Allocator& = Allocator());
 ```
 *Effects:* Constructs an empty `map` using the specified comparison
 object and allocator.
 template <class InputIterator>
   map(InputIterator first, InputIterator last,
       const Compare& comp = Compare(), const Allocator& = Allocator());
 ```
 *Effects:* Constructs an empty `map` using the specified comparison
 object and allocator, and inserts elements from the range \[`first`,
 `last`).
 *Complexity:* Linear in N if the range \[`first`, `last`) is already
+sorted using `comp` and otherwise N log N, where N is `last - first`.
 #### `map` element access <a id="map.access">[[map.access]]</a>
 ``` cpp
 T& operator[](const key_type& x);
 ```
+*Effects:* Equivalent to: `return try_emplace(x).first->second;`
 ``` cpp
 T& operator[](key_type&& x);
 ```
+*Effects:* Equivalent to: `return try_emplace(move(x)).first->second;`
 ``` cpp
 T&       at(const key_type& x);
 const T& at(const key_type& x) const;
 ```
 *Complexity:* Logarithmic.
 #### `map` modifiers <a id="map.modifiers">[[map.modifiers]]</a>
 ``` cpp
+template <class P>
+  pair<iterator, bool> insert(P&& x);
+template <class P>
+ iterator insert(const_iterator position, P&& x);
 ```
 *Effects:* The first form is equivalent to
 `return emplace(std::forward<P>(x))`. The second form is equivalent to
 `return emplace_hint(position, std::forward<P>(x))`.
 *Remarks:* These signatures shall not participate in overload resolution
+unless `is_constructible_v<value_type, P&&>` is `true`.
+``` cpp
+template <class... Args>
+  pair<iterator, bool> try_emplace(const key_type& k, Args&&... args);
+template <class... Args>
+  iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args);
+```
+*Requires:* `value_type` shall be `EmplaceConstructible` into `map` from
+`piecewise_construct`, `forward_as_tuple(k)`,
+`forward_as_tuple(std::forward<Args>(args)...)`.
+*Effects:* If the map already contains an element whose key is
+equivalent to `k`, there is no effect. Otherwise inserts an object of
+type `value_type` constructed with `piecewise_construct`,
+`forward_as_tuple(k)`, `forward_as_tuple(std::forward<Args>(args)...)`.
+*Returns:* In the first overload, the `bool` component of the returned
+pair is `true` if and only if the insertion took place. The returned
+iterator points to the map element whose key is equivalent to `k`.
+*Complexity:* The same as `emplace` and `emplace_hint`, respectively.
+``` cpp
+template <class... Args>
+  pair<iterator, bool> try_emplace(key_type&& k, Args&&... args);
+template <class... Args>
+  iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args);
+```
+*Requires:* `value_type` shall be `EmplaceConstructible` into `map` from
+`piecewise_construct`, `forward_as_tuple(std::move(k))`,
+`forward_as_tuple(std::forward<Args>(args)...)`.
+*Effects:* If the map already contains an element whose key is
+equivalent to `k`, there is no effect. Otherwise inserts an object of
+type `value_type` constructed with `piecewise_construct`,
+`forward_as_tuple(std::move(k))`,
+`forward_as_tuple(std::forward<Args>(args)...)`.
+*Returns:* In the first overload, the `bool` component of the returned
+pair is `true` if and only if the insertion took place. The returned
+iterator points to the map element whose key is equivalent to `k`.
+*Complexity:* The same as `emplace` and `emplace_hint`, respectively.
+``` cpp
+template <class M>
+  pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj);
+template <class M>
+  iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj);
+```
+*Requires:* `is_assignable_v<mapped_type&, M&&>` shall be `true`.
+`value_type` shall be `EmplaceConstructible` into `map` from `k`,
+`forward<M>(obj)`.
+*Effects:* If the map already contains an element `e` whose key is
+equivalent to `k`, assigns `std::forward<M>(obj)` to `e.second`.
+Otherwise inserts an object of type `value_type` constructed with `k`,
+`std::forward<M>(obj)`.
+*Returns:* In the first overload, the `bool` component of the returned
+pair is `true` if and only if the insertion took place. The returned
+iterator points to the map element whose key is equivalent to `k`.
+*Complexity:* The same as `emplace` and `emplace_hint`, respectively.
+``` cpp
+template <class M>
+  pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj);
+template <class M>
+  iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj);
+```
+*Requires:* `is_assignable_v<mapped_type&, M&&>` shall be `true`.
+`value_type` shall be `EmplaceConstructible` into `map` from `move(k)`,
+`forward<M>(obj)`.
+*Effects:* If the map already contains an element `e` whose key is
+equivalent to `k`, assigns `std::forward<M>(obj)` to `e.second`.
+Otherwise inserts an object of type `value_type` constructed with
+`std::move(k)`, `std::forward<M>(obj)`.
+*Returns:* In the first overload, the `bool` component of the returned
+pair is `true` if and only if the insertion took place. The returned
+iterator points to the map element whose key is equivalent to `k`.
+*Complexity:* The same as `emplace` and `emplace_hint`, respectively.
 #### `map` specialized algorithms <a id="map.special">[[map.special]]</a>
 ``` cpp
 template <class Key, class T, class Compare, class Allocator>
   void swap(map<Key, T, Compare, Allocator>& x,
+            map<Key, T, Compare, Allocator>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class template `multimap` <a id="multimap">[[multimap]]</a>
 #### Class template `multimap` overview <a id="multimap.overview">[[multimap.overview]]</a>
 A `multimap` satisfies all of the requirements of a container and of a
 reversible container ([[container.requirements]]), of an associative
 container ([[associative.reqmts]]), and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). A `multimap` also provides
+most operations described in  [[associative.reqmts]] for equal keys.
+This means that a `multimap` supports the `a_eq` operations in
+[[associative.reqmts]] but not the `a_uniq` operations. For a
 `multimap<Key,T>` the `key_type` is `Key` and the `value_type` is
 `pair<const Key,T>`. Descriptions are provided here only for operations
 on `multimap` that are not described in one of those tables or for
 operations where there is additional semantic information.
   template <class Key, class T, class Compare = less<Key>,
             class Allocator = allocator<pair<const Key, T>>>
   class multimap {
   public:
     // types:
+ using key_type               = Key;
+ using mapped_type            = T;
+ using value_type             = pair<const Key, T>;
+ using key_compare            = Compare;
+ using allocator_type         = Allocator;
+ using pointer                = typename allocator_traits<Allocator>::pointer;
+ using const_pointer          = typename allocator_traits<Allocator>::const_pointer;
+ using reference              = value_type&;
+ using const_reference        = const value_type&;
+ using size_type              = implementation-defined; // see [container.requirements]
+ using difference_type        = implementation-defined; // see [container.requirements]
+ using iterator               = implementation-defined  // type of multimap::iterator; // see [container.requirements]
+ using const_iterator         = implementation-defined  // type of multimap::const_iterator; // see [container.requirements]
+ using reverse_iterator       = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+    using node_type              = unspecified;
     class value_compare {
       friend class multimap;
     protected:
       Compare comp;
       value_compare(Compare c) : comp(c) { }
     public:
       bool operator()(const value_type& x, const value_type& y) const {
         return comp(x.first, y.first);
       }
     };
+    // [multimap.cons], construct/copy/destroy
     multimap() : multimap(Compare()) { }
+    explicit multimap(const Compare& comp, const Allocator& = Allocator());
     template <class InputIterator>
       multimap(InputIterator first, InputIterator last,
                const Compare& comp = Compare(),
                const Allocator& = Allocator());
     multimap(const multimap& x);
         : multimap(first, last, Compare(), a) { }
     multimap(initializer_list<value_type> il, const Allocator& a)
       : multimap(il, Compare(), a) { }
     ~multimap();
     multimap& operator=(const multimap& x);
+    multimap& operator=(multimap&& x)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_move_assignable_v<Compare>);
     multimap& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
     // iterators:
     iterator               begin() noexcept;
     // capacity:
     bool      empty() const noexcept;
     size_type size() const noexcept;
     size_type max_size() const noexcept;
+    // [multimap.modifiers], modifiers
     template <class... Args> iterator emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     iterator insert(const value_type& x);
+    iterator insert(value_type&& x);
     template <class P> iterator insert(P&& x);
     iterator insert(const_iterator position, const value_type& x);
+    iterator insert(const_iterator position, value_type&& x);
     template <class P> iterator insert(const_iterator position, P&& x);
     template <class InputIterator>
       void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
+    node_type extract(const_iterator position);
+    node_type extract(const key_type& x);
+    iterator insert(node_type&& nh);
+    iterator insert(const_iterator hint, node_type&& nh);
+    iterator  erase(iterator position);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& x);
     iterator  erase(const_iterator first, const_iterator last);
+    void swap(multimap&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_swappable_v<Compare>);
     void      clear() noexcept;
+    template<class C2>
+      void merge(multimap<Key, T, C2, Allocator>& source);
+    template<class C2>
+      void merge(multimap<Key, T, C2, Allocator>&& source);
+    template<class C2>
+      void merge(map<Key, T, C2, Allocator>& source);
+    template<class C2>
+      void merge(map<Key, T, C2, Allocator>&& source);
     // observers:
     key_compare key_comp() const;
     value_compare value_comp() const;
     // map operations:
     iterator       upper_bound(const key_type& x);
     const_iterator upper_bound(const key_type& x) const;
     template <class K> iterator       upper_bound(const K& x);
     template <class K> const_iterator upper_bound(const K& x) const;
+    pair<iterator, iterator>               equal_range(const key_type& x);
+    pair<const_iterator, const_iterator>   equal_range(const key_type& x) const;
     template <class K>
       pair<iterator, iterator>             equal_range(const K& x);
     template <class K>
       pair<const_iterator, const_iterator> equal_range(const K& x) const;
   };
+  template<class InputIterator, class Compare = less<iter_key_t<InputIterator>>,
+           class Allocator = allocator<iter_to_alloc_t<InputIterator>>>
+    multimap(InputIterator, InputIterator, Compare = Compare(), Allocator = Allocator())
+      -> multimap<iter_key_t<InputIterator>, iter_val_t<InputIterator>, Compare, Allocator>;
+  template<class Key, class T, class Compare = less<Key>,
+           class Allocator = allocator<pair<const Key, T>>>
+    multimap(initializer_list<pair<const Key, T>>, Compare = Compare(), Allocator = Allocator())
+      -> multimap<Key, T, Compare, Allocator>;
+  template<class InputIterator, class Allocator>
+    multimap(InputIterator, InputIterator, Allocator)
+      -> multimap<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+                  less<iter_key_t<InputIterator>>, Allocator>;
+  template<class Key, class T, class Allocator>
+    multimap(initializer_list<pair<const Key, T>>, Allocator)
+      -> multimap<Key, T, less<Key>, Allocator>;
   template <class Key, class T, class Compare, class Allocator>
     bool operator==(const multimap<Key, T, Compare, Allocator>& x,
                     const multimap<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     bool operator< (const multimap<Key, T, Compare, Allocator>& x,
                     const multimap<Key, T, Compare, Allocator>& y);
   template <class Key, class T, class Compare, class Allocator>
     bool operator<=(const multimap<Key, T, Compare, Allocator>& x,
                     const multimap<Key, T, Compare, Allocator>& y);
+  // [multimap.special], specialized algorithms
   template <class Key, class T, class Compare, class Allocator>
     void swap(multimap<Key, T, Compare, Allocator>& x,
+              multimap<Key, T, Compare, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
 #### `multimap` constructors <a id="multimap.cons">[[multimap.cons]]</a>
 ``` cpp
+explicit multimap(const Compare& comp, const Allocator& = Allocator());
 ```
 *Effects:* Constructs an empty `multimap` using the specified comparison
 object and allocator.
   multimap(InputIterator first, InputIterator last,
            const Compare& comp = Compare(),
            const Allocator& = Allocator());
 ```
 *Effects:* Constructs an empty `multimap` using the specified comparison
 object and allocator, and inserts elements from the range \[`first`,
 `last`).
 *Complexity:* Linear in N if the range \[`first`, `last`) is already
 *Effects:* The first form is equivalent to
 `return emplace(std::forward<P>(x))`. The second form is equivalent to
 `return emplace_hint(position, std::forward<P>(x))`.
 *Remarks:* These signatures shall not participate in overload resolution
+unless `is_constructible_v<value_type, P&&>` is `true`.
 #### `multimap` specialized algorithms <a id="multimap.special">[[multimap.special]]</a>
 ``` cpp
 template <class Key, class T, class Compare, class Allocator>
   void swap(multimap<Key, T, Compare, Allocator>& x,
+            multimap<Key, T, Compare, Allocator>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class template `set` <a id="set">[[set]]</a>
 #### Class template `set` overview <a id="set.overview">[[set.overview]]</a>
 A `set` satisfies all of the requirements of a container, of a
 reversible container ([[container.requirements]]), of an associative
 container ([[associative.reqmts]]), and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). A `set` also provides most
+operations described in  [[associative.reqmts]] for unique keys. This
+means that a `set` supports the `a_uniq` operations in
+[[associative.reqmts]] but not the `a_eq` operations. For a `set<Key>`
 both the `key_type` and `value_type` are `Key`. Descriptions are
 provided here only for operations on `set` that are not described in one
 of these tables and for operations where there is additional semantic
 information.
   template <class Key, class Compare = less<Key>,
             class Allocator = allocator<Key>>
   class set {
   public:
     // types:
+ using key_type               = Key;
+ using key_compare            = Compare;
+ using value_type             = Key;
+ using value_compare          = Compare;
+ using allocator_type         = Allocator;
+ using pointer                = typename allocator_traits<Allocator>::pointer;
+ using const_pointer          = typename allocator_traits<Allocator>::const_pointer;
+ using reference              = value_type&;
+ using const_reference        = const value_type&;
+ using size_type              = implementation-defined; // see [container.requirements]
+ using difference_type        = implementation-defined; // see [container.requirements]
+ using iterator               = implementation-defined  // type of set::iterator; // see [container.requirements]
+ using const_iterator         = implementation-defined  // type of set::const_iterator; // see [container.requirements]
+ using reverse_iterator       = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+    using node_type              = unspecified;
+    using insert_return_type     = INSERT_RETURN_TYPE<iterator, node_type>;
+    // [set.cons], construct/copy/destroy
     set() : set(Compare()) { }
+    explicit set(const Compare& comp, const Allocator& = Allocator());
     template <class InputIterator>
       set(InputIterator first, InputIterator last,
           const Compare& comp = Compare(), const Allocator& = Allocator());
     set(const set& x);
     set(set&& x);
     explicit set(const Allocator&);
     set(const set&, const Allocator&);
     set(set&&, const Allocator&);
+    set(initializer_list<value_type>, const Compare& = Compare(),
         const Allocator& = Allocator());
     template <class InputIterator>
       set(InputIterator first, InputIterator last, const Allocator& a)
         : set(first, last, Compare(), a) { }
     set(initializer_list<value_type> il, const Allocator& a)
       : set(il, Compare(), a) { }
     ~set();
     set& operator=(const set& x);
+    set& operator=(set&& x)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_move_assignable_v<Compare>);
     set& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
     // iterators:
     iterator               begin() noexcept;
     iterator insert(const_iterator position, value_type&& x);
     template <class InputIterator>
       void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
+    node_type extract(const_iterator position);
+    node_type extract(const key_type& x);
+    insert_return_type insert(node_type&& nh);
+    iterator           insert(const_iterator hint, node_type&& nh);
+    iterator  erase(iterator position);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& x);
     iterator  erase(const_iterator first, const_iterator last);
+    void swap(set&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_swappable_v<Compare>);
     void      clear() noexcept;
+    template<class C2>
+      void merge(set<Key, C2, Allocator>& source);
+    template<class C2>
+      void merge(set<Key, C2, Allocator>&& source);
+    template<class C2>
+      void merge(multiset<Key, C2, Allocator>& source);
+    template<class C2>
+      void merge(multiset<Key, C2, Allocator>&& source);
     // observers:
     key_compare key_comp() const;
     value_compare value_comp() const;
     // set operations:
       pair<iterator, iterator>             equal_range(const K& x);
     template <class K>
       pair<const_iterator, const_iterator> equal_range(const K& x) const;
   };
+  template<class InputIterator,
+           class Compare = less<typename iterator_traits<InputIterator>::value_type>,
+           class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+    set(InputIterator, InputIterator,
+        Compare = Compare(), Allocator = Allocator())
+      -> set<typename iterator_traits<InputIterator>::value_type, Compare, Allocator>;
+  template<class Key, class Compare = less<Key>, class Allocator = allocator<Key>>
+    set(initializer_list<Key>, Compare = Compare(), Allocator = Allocator())
+      -> set<Key, Compare, Allocator>;
+  template<class InputIterator, class Allocator>
+    set(InputIterator, InputIterator, Allocator)
+      -> set<typename iterator_traits<InputIterator>::value_type,
+             less<typename iterator_traits<InputIterator>::value_type>, Allocator>;
+  template<class Key, class Allocator>
+    set(initializer_list<Key>, Allocator) -> set<Key, less<Key>, Allocator>;
   template <class Key, class Compare, class Allocator>
     bool operator==(const set<Key, Compare, Allocator>& x,
                     const set<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     bool operator< (const set<Key, Compare, Allocator>& x,
                     const set<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     bool operator<=(const set<Key, Compare, Allocator>& x,
                     const set<Key, Compare, Allocator>& y);
+  // [set.special], specialized algorithms
   template <class Key, class Compare, class Allocator>
     void swap(set<Key, Compare, Allocator>& x,
+              set<Key, Compare, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
 #### `set` constructors, copy, and assignment <a id="set.cons">[[set.cons]]</a>
 ``` cpp
+explicit set(const Compare& comp, const Allocator& = Allocator());
 ```
+*Effects:* Constructs an empty `set` using the specified comparison
 objects and allocator.
 *Complexity:* Constant.
 ``` cpp
 *Effects:* Constructs an empty `set` using the specified comparison
 object and allocator, and inserts elements from the range \[`first`,
 `last`).
 *Complexity:* Linear in N if the range \[`first`, `last`) is already
 sorted using `comp` and otherwise N log N, where N is `last - first`.
 #### `set` specialized algorithms <a id="set.special">[[set.special]]</a>
 ``` cpp
 template <class Key, class Compare, class Allocator>
   void swap(set<Key, Compare, Allocator>& x,
+            set<Key, Compare, Allocator>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class template `multiset` <a id="multiset">[[multiset]]</a>
 #### Class template `multiset` overview <a id="multiset.overview">[[multiset.overview]]</a>
 A `multiset` satisfies all of the requirements of a container, of a
 reversible container ([[container.requirements]]), of an associative
 container ([[associative.reqmts]]), and of an allocator-aware container
 (Table  [[tab:containers.allocatoraware]]). `multiset` also provides
+most operations described in  [[associative.reqmts]] for duplicate keys.
+This means that a `multiset` supports the `a_eq` operations in
+[[associative.reqmts]] but not the `a_uniq` operations. For a
 `multiset<Key>` both the `key_type` and `value_type` are `Key`.
 Descriptions are provided here only for operations on `multiset` that
 are not described in one of these tables and for operations where there
 is additional semantic information.
   template <class Key, class Compare = less<Key>,
             class Allocator = allocator<Key>>
   class multiset {
   public:
     // types:
+ using key_type               = Key;
+ using key_compare            = Compare;
+ using value_type             = Key;
+ using value_compare          = Compare;
+ using allocator_type         = Allocator;
+ using pointer                = typename allocator_traits<Allocator>::pointer;
+ using const_pointer          = typename allocator_traits<Allocator>::const_pointer;
+ using reference              = value_type&;
+ using const_reference        = const value_type&;
+ using size_type              = implementation-defined; // see [container.requirements]
+ using difference_type        = implementation-defined; // see [container.requirements]
+ using iterator               = implementation-defined  // type of multiset::iterator; // see [container.requirements]
+ using const_iterator         = implementation-defined  // type of multiset::const_iterator; // see [container.requirements]
+ using reverse_iterator       = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+    using node_type              = unspecified;
+    // [multiset.cons], construct/copy/destroy
     multiset() : multiset(Compare()) { }
+    explicit multiset(const Compare& comp, const Allocator& = Allocator());
     template <class InputIterator>
       multiset(InputIterator first, InputIterator last,
+               const Compare& comp = Compare(), const Allocator& = Allocator());
     multiset(const multiset& x);
     multiset(multiset&& x);
     explicit multiset(const Allocator&);
     multiset(const multiset&, const Allocator&);
     multiset(multiset&&, const Allocator&);
+    multiset(initializer_list<value_type>, const Compare& = Compare(),
              const Allocator& = Allocator());
     template <class InputIterator>
       multiset(InputIterator first, InputIterator last, const Allocator& a)
         : multiset(first, last, Compare(), a) { }
     multiset(initializer_list<value_type> il, const Allocator& a)
       : multiset(il, Compare(), a) { }
     ~multiset();
     multiset& operator=(const multiset& x);
+    multiset& operator=(multiset&& x)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_move_assignable_v<Compare>);
     multiset& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
     // iterators:
     iterator               begin() noexcept;
     iterator insert(const_iterator position, value_type&& x);
     template <class InputIterator>
       void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
+    node_type extract(const_iterator position);
+    node_type extract(const key_type& x);
+    iterator insert(node_type&& nh);
+    iterator insert(const_iterator hint, node_type&& nh);
+    iterator  erase(iterator position);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& x);
     iterator  erase(const_iterator first, const_iterator last);
+    void swap(multiset&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_swappable_v<Compare>);
     void      clear() noexcept;
+    template<class C2>
+      void merge(multiset<Key, C2, Allocator>& source);
+    template<class C2>
+      void merge(multiset<Key, C2, Allocator>&& source);
+    template<class C2>
+      void merge(set<Key, C2, Allocator>& source);
+    template<class C2>
+      void merge(set<Key, C2, Allocator>&& source);
     // observers:
     key_compare key_comp() const;
     value_compare value_comp() const;
     // set operations:
       pair<iterator, iterator>             equal_range(const K& x);
     template <class K>
       pair<const_iterator, const_iterator> equal_range(const K& x) const;
   };
+  template<class InputIterator,
+           class Compare = less<typename iterator_traits<InputIterator>::value_type>,
+           class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+    multiset(InputIterator, InputIterator,
+             Compare = Compare(), Allocator = Allocator())
+      -> multiset<typename iterator_traits<InputIterator>::value_type, Compare, Allocator>;
+  template<class Key, class Compare = less<Key>, class Allocator = allocator<Key>>
+    multiset(initializer_list<Key>, Compare = Compare(), Allocator = Allocator())
+      -> multiset<Key, Compare, Allocator>;
+  template<class InputIterator, class Allocator>
+    multiset(InputIterator, InputIterator, Allocator)
+      -> multiset<typename iterator_traits<InputIterator>::value_type,
+                  less<typename iterator_traits<InputIterator>::value_type>, Allocator>;
+  template<class Key, class Allocator>
+    multiset(initializer_list<Key>, Allocator) -> multiset<Key, less<Key>, Allocator>;
   template <class Key, class Compare, class Allocator>
     bool operator==(const multiset<Key, Compare, Allocator>& x,
                     const multiset<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     bool operator< (const multiset<Key, Compare, Allocator>& x,
                     const multiset<Key, Compare, Allocator>& y);
   template <class Key, class Compare, class Allocator>
     bool operator<=(const multiset<Key, Compare, Allocator>& x,
                     const multiset<Key, Compare, Allocator>& y);
+  // [multiset.special], specialized algorithms
   template <class Key, class Compare, class Allocator>
     void swap(multiset<Key, Compare, Allocator>& x,
+              multiset<Key, Compare, Allocator>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
 #### `multiset` constructors <a id="multiset.cons">[[multiset.cons]]</a>
 ``` cpp
+explicit multiset(const Compare& comp, const Allocator& = Allocator());
 ```
+*Effects:* Constructs an empty `multiset` using the specified comparison
+object and allocator.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   multiset(InputIterator first, InputIterator last,
            const Compare& comp = Compare(), const Allocator& = Allocator());
 ```
 *Effects:* Constructs an empty `multiset` using the specified comparison
 object and allocator, and inserts elements from the range \[`first`,
 `last`).
 *Complexity:* Linear in N if the range \[`first`, `last`) is already
 #### `multiset` specialized algorithms <a id="multiset.special">[[multiset.special]]</a>
 ``` cpp
 template <class Key, class Compare, class Allocator>
   void swap(multiset<Key, Compare, Allocator>& x,
+            multiset<Key, Compare, Allocator>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ## Unordered associative containers <a id="unord">[[unord]]</a>
 ### In general <a id="unord.general">[[unord.general]]</a>
 The header `<unordered_map>` defines the class templates `unordered_map`
 and `unordered_multimap`; the header `<unordered_set>` defines the class
 templates `unordered_set` and `unordered_multiset`.
+The exposition-only alias templates `iter_key_t`, `iter_val_t`, and
+`iter_to_alloc_t` defined in [[associative.general]] may appear in
+deduction guides for unordered containers.
 ### Header `<unordered_map>` synopsis <a id="unord.map.syn">[[unord.map.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
+  // [unord.map], class template unordered_map
   template <class Key,
             class T,
             class Hash = hash<Key>,
+            class Pred = equal_to<Key>,
+            class Alloc = allocator<pair<const Key, T>>>
     class unordered_map;
+  // [unord.multimap], class template unordered_multimap
   template <class Key,
             class T,
             class Hash = hash<Key>,
+            class Pred = equal_to<Key>,
+            class Alloc = allocator<pair<const Key, T>>>
     class unordered_multimap;
   template <class Key, class T, class Hash, class Pred, class Alloc>
     void swap(unordered_map<Key, T, Hash, Pred, Alloc>& x,
+              unordered_map<Key, T, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
   template <class Key, class T, class Hash, class Pred, class Alloc>
     void swap(unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
+              unordered_multimap<Key, T, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_map<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_map<Key, T, Hash, Pred, Alloc>& b);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_multimap<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_multimap<Key, T, Hash, Pred, Alloc>& b);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_multimap<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_multimap<Key, T, Hash, Pred, Alloc>& b);
+  namespace pmr {
+    template <class Key,
+              class T,
+              class Hash = hash<Key>,
+              class Pred = equal_to<Key>>
+      using unordered_map =
+        std::unordered_map<Key, T, Hash, Pred,
+                           polymorphic_allocator<pair<const Key, T>>>;
+    template <class Key,
+              class T,
+              class Hash = hash<Key>,
+              class Pred = equal_to<Key>>
+      using unordered_multimap =
+        std::unordered_multimap<Key, T, Hash, Pred,
+                                polymorphic_allocator<pair<const Key, T>>>;
+  }
+}
 ```
 ### Header `<unordered_set>` synopsis <a id="unord.set.syn">[[unord.set.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
+  // [unord.set], class template unordered_set
   template <class Key,
             class Hash = hash<Key>,
+            class Pred = equal_to<Key>,
+            class Alloc = allocator<Key>>
     class unordered_set;
+  // [unord.multiset], class template unordered_multiset
   template <class Key,
             class Hash = hash<Key>,
+            class Pred = equal_to<Key>,
+            class Alloc = allocator<Key>>
     class unordered_multiset;
   template <class Key, class Hash, class Pred, class Alloc>
     void swap(unordered_set<Key, Hash, Pred, Alloc>& x,
+              unordered_set<Key, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
   template <class Key, class Hash, class Pred, class Alloc>
     void swap(unordered_multiset<Key, Hash, Pred, Alloc>& x,
+              unordered_multiset<Key, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_set<Key, Hash, Pred, Alloc>& a,
                     const unordered_set<Key, Hash, Pred, Alloc>& b);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_multiset<Key, Hash, Pred, Alloc>& a,
                     const unordered_multiset<Key, Hash, Pred, Alloc>& b);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_multiset<Key, Hash, Pred, Alloc>& a,
                     const unordered_multiset<Key, Hash, Pred, Alloc>& b);
+  namespace pmr {
+    template <class Key,
+              class Hash = hash<Key>,
+              class Pred = equal_to<Key>>
+      using unordered_set = std::unordered_set<Key, Hash, Pred,
+                                               polymorphic_allocator<Key>>;
+    template <class Key,
+              class Hash = hash<Key>,
+              class Pred = equal_to<Key>>
+      using unordered_multiset = std::unordered_multiset<Key, Hash, Pred,
+                                                         polymorphic_allocator<Key>>;
+  }
+}
 ```
 ### Class template `unordered_map` <a id="unord.map">[[unord.map]]</a>
 #### Class template `unordered_map` overview <a id="unord.map.overview">[[unord.map.overview]]</a>
 (Table  [[tab:containers.allocatoraware]]). It provides the operations
 described in the preceding requirements table for unique keys; that is,
 an `unordered_map` supports the `a_uniq` operations in that table, not
 the `a_eq` operations. For an `unordered_map<Key, T>` the `key type` is
 `Key`, the mapped type is `T`, and the value type is
+`pair<const Key, T>`.
 This section only describes operations on `unordered_map` that are not
 described in one of the requirement tables, or for which there is
 additional semantic information.
 ``` cpp
 namespace std {
   template <class Key,
             class T,
             class Hash = hash<Key>,
+            class Pred = equal_to<Key>,
+            class Allocator = allocator<pair<const Key, T>>>
+  class unordered_map {
   public:
+    // types:
+ using key_type             = Key;
+ using mapped_type          = T;
+ using value_type           = pair<const Key, T>;
+ using hasher               = Hash;
+ using key_equal            = Pred;
+ using allocator_type       = Allocator;
+ using pointer              = typename allocator_traits<Allocator>::pointer;
+ using const_pointer        = typename allocator_traits<Allocator>::const_pointer;
+ using reference            = value_type&;
+ using const_reference      = const value_type&;
+ using size_type            = implementation-defined; // see [container.requirements]
+ using difference_type      = implementation-defined; // see [container.requirements]
+ using iterator             = implementation-defined  // type of unordered_map::iterator; // see [container.requirements]
+ using const_iterator       = implementation-defined  // type of unordered_map::const_iterator; // see [container.requirements]
+ using local_iterator       = implementation-defined  // type of unordered_map::local_iterator; // see [container.requirements]
+ using const_local_iterator = implementation-defined  // type of unordered_map::const_local_iterator; // see [container.requirements]
+    using node_type            = unspecified;
+    using insert_return_type   = INSERT_RETURN_TYPE<iterator, node_type>;
+    // [unord.map.cnstr], construct/copy/destroy
     unordered_map();
     explicit unordered_map(size_type n,
                            const hasher& hf = hasher(),
                            const key_equal& eql = key_equal(),
                            const allocator_type& a = allocator_type());
     unordered_map(const unordered_map&);
     unordered_map(unordered_map&&);
     explicit unordered_map(const Allocator&);
     unordered_map(const unordered_map&, const Allocator&);
     unordered_map(unordered_map&&, const Allocator&);
+    unordered_map(initializer_list<value_type> il,
+ size_type n = see below,
                   const hasher& hf = hasher(),
                   const key_equal& eql = key_equal(),
                   const allocator_type& a = allocator_type());
     unordered_map(size_type n, const allocator_type& a)
       : unordered_map(n, hasher(), key_equal(), a) { }
     unordered_map(initializer_list<value_type> il, size_type n, const hasher& hf,
                   const allocator_type& a)
       : unordered_map(il, n, hf, key_equal(), a) { }
     ~unordered_map();
     unordered_map& operator=(const unordered_map&);
+    unordered_map& operator=(unordered_map&&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_move_assignable_v<Hash> &&
+               is_nothrow_move_assignable_v<Pred>);
     unordered_map& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
+    // iterators:
     iterator       begin() noexcept;
     const_iterator begin() const noexcept;
     iterator       end() noexcept;
     const_iterator end() const noexcept;
     const_iterator cbegin() const noexcept;
     const_iterator cend() const noexcept;
+    // capacity:
+    bool      empty() const noexcept;
+    size_type size() const noexcept;
+    size_type max_size() const noexcept;
+    // [unord.map.modifiers], modifiers
     template <class... Args> pair<iterator, bool> emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     pair<iterator, bool> insert(const value_type& obj);
+    pair<iterator, bool> insert(value_type&& obj);
     template <class P> pair<iterator, bool> insert(P&& obj);
     iterator       insert(const_iterator hint, const value_type& obj);
+    iterator       insert(const_iterator hint, value_type&& obj);
     template <class P> iterator insert(const_iterator hint, P&& obj);
     template <class InputIterator> void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
+    node_type extract(const_iterator position);
+    node_type extract(const key_type& x);
+    insert_return_type insert(node_type&& nh);
+    iterator           insert(const_iterator hint, node_type&& nh);
+    template <class... Args>
+      pair<iterator, bool> try_emplace(const key_type& k, Args&&... args);
+    template <class... Args>
+      pair<iterator, bool> try_emplace(key_type&& k, Args&&... args);
+    template <class... Args>
+      iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args);
+    template <class... Args>
+      iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args);
+    template <class M>
+      pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj);
+    template <class M>
+      pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj);
+    template <class M>
+      iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj);
+    template <class M>
+      iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj);
+    iterator  erase(iterator position);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
+    void      swap(unordered_map&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_swappable_v<Hash> &&
+               is_nothrow_swappable_v<Pred>);
     void      clear() noexcept;
+ template<class H2, class P2>
+      void merge(unordered_map<Key, T, H2, P2, Allocator>& source);
+    template<class H2, class P2>
+      void merge(unordered_map<Key, T, H2, P2, Allocator>&& source);
+    template<class H2, class P2>
+      void merge(unordered_multimap<Key, T, H2, P2, Allocator>& source);
+    template<class H2, class P2>
+      void merge(unordered_multimap<Key, T, H2, P2, Allocator>&& source);
+    // observers:
     hasher hash_function() const;
     key_equal key_eq() const;
+    // map operations:
     iterator       find(const key_type& k);
     const_iterator find(const key_type& k) const;
     size_type      count(const key_type& k) const;
+    pair<iterator, iterator>             equal_range(const key_type& k);
+    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
+    // [unord.map.elem], element access
     mapped_type& operator[](const key_type& k);
     mapped_type& operator[](key_type&& k);
     mapped_type& at(const key_type& k);
     const mapped_type& at(const key_type& k) const;
+    // bucket interface:
     size_type bucket_count() const noexcept;
     size_type max_bucket_count() const noexcept;
     size_type bucket_size(size_type n) const;
     size_type bucket(const key_type& k) const;
     local_iterator begin(size_type n);
     local_iterator end(size_type n);
     const_local_iterator end(size_type n) const;
     const_local_iterator cbegin(size_type n) const;
     const_local_iterator cend(size_type n) const;
+    // hash policy:
     float load_factor() const noexcept;
     float max_load_factor() const noexcept;
     void max_load_factor(float z);
     void rehash(size_type n);
     void reserve(size_type n);
   };
+  template<class InputIterator,
+           class Hash = hash<iter_key_t<InputIterator>>,
+           class Pred = equal_to<iter_key_t<InputIterator>>,
+           class Allocator = allocator<iter_to_alloc_t<InputIterator>>>
+    unordered_map(InputIterator, InputIterator, typename see below::size_type = see below,
+                  Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> unordered_map<iter_key_t<InputIterator>, iter_value_t<InputIterator>, Hash, Pred,
+                       Allocator>;
+  template<class Key, class T, class Hash = hash<Key>,
+           class Pred = equal_to<Key>, class Allocator = allocator<pair<const Key, T>>>
+    unordered_map(initializer_list<pair<const Key, T>>,
+                  typename see below::size_type = see below, Hash = Hash(),
+                  Pred = Pred(), Allocator = Allocator())
+      -> unordered_map<Key, T, Hash, Pred, Allocator>;
+  template<class InputIterator, class Allocator>
+    unordered_map(InputIterator, InputIterator, typename see below::size_type, Allocator)
+      -> unordered_map<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+                       hash<iter_key_t<InputIterator>>, equal_to<iter_key_t<InputIterator>>,
+                       Allocator>;
+  template<class InputIterator, class Allocator>
+    unordered_map(InputIterator, InputIterator, Allocator)
+      -> unordered_map<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+                       hash<iter_key_t<InputIterator>>, equal_to<iter_key_t<InputIterator>>,
+                       Allocator>;
+  template<class InputIterator, class Hash, class Allocator>
+    unordered_map(InputIterator, InputIterator, typename see below::size_type, Hash, Allocator)
+      -> unordered_map<iter_key_t<InputIterator>, iter_val_t<InputIterator>, Hash,
+                       equal_to<iter_key_t<InputIterator>>, Allocator>;
+  template<class Key, class T, typename Allocator>
+    unordered_map(initializer_list<pair<const Key, T>>, typename see below::size_type,
+                  Allocator)
+      -> unordered_map<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+  template<class Key, class T, typename Allocator>
+    unordered_map(initializer_list<pair<const Key, T>>, Allocator)
+      -> unordered_map<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+  template<class Key, class T, class Hash, class Allocator>
+    unordered_map(initializer_list<pair<const Key, T>>, typename see below::size_type, Hash,
+                  Allocator)
+      -> unordered_map<Key, T, Hash, equal_to<Key>, Allocator>;
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_map<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_map<Key, T, Hash, Pred, Alloc>& b);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_map<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_map<Key, T, Hash, Pred, Alloc>& b);
+  // [unord.map.swap], swap
+  template <class Key, class T, class Hash, class Pred, class Alloc>
+    void swap(unordered_map<Key, T, Hash, Pred, Alloc>& x,
+              unordered_map<Key, T, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
+A `size_type` parameter type in an `unordered_map` deduction guide
+refers to the `size_type` member type of the type deduced by the
+deduction guide.
 #### `unordered_map` constructors <a id="unord.map.cnstr">[[unord.map.cnstr]]</a>
 ``` cpp
 unordered_map() : unordered_map(size_type(see below)) { }
 explicit unordered_map(size_type n,
                        const key_equal& eql = key_equal(),
                        const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_map` using the specified hash
+function, key equality predicate, and allocator, and using at least `n`
 buckets. For the default constructor, the number of buckets is
+*implementation-defined*. `max_load_factor()` returns `1.0`.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   unordered_map(InputIterator f, InputIterator l,
                 size_type n = see below,
                 const hasher& hf = hasher(),
                 const key_equal& eql = key_equal(),
                 const allocator_type& a = allocator_type());
+unordered_map(initializer_list<value_type> il,
+              size_type n = see below,
+              const hasher& hf = hasher(),
+              const key_equal& eql = key_equal(),
+              const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_map` using the specified hash
+function, key equality predicate, and allocator, and using at least `n`
+buckets. If `n` is not provided, the number of buckets is
+*implementation-defined*. Then inserts elements from the range \[`f`,
+`l`) for the first form, or from the range \[`il.begin()`, `il.end()`)
+for the second form. `max_load_factor()` returns `1.0`.
 *Complexity:* Average case linear, worst case quadratic.
 #### `unordered_map` element access <a id="unord.map.elem">[[unord.map.elem]]</a>
 ``` cpp
 mapped_type& operator[](const key_type& k);
+```
+*Effects:* Equivalent to: `return try_emplace(k).first->second;`
+``` cpp
 mapped_type& operator[](key_type&& k);
 ```
+*Effects:* Equivalent to: `return try_emplace(move(k)).first->second;`
 ``` cpp
 mapped_type& at(const key_type& k);
 const mapped_type& at(const key_type& k) const;
 ```
 ``` cpp
 template <class P>
   pair<iterator, bool> insert(P&& obj);
 ```
+*Effects:* Equivalent to: `return emplace(std::forward<P>(obj));`
 *Remarks:* This signature shall not participate in overload resolution
+unless `is_constructible_v<value_type, P&&>` is `true`.
 ``` cpp
 template <class P>
   iterator insert(const_iterator hint, P&& obj);
 ```
+*Effects:* Equivalent to:
+`return emplace_hint(hint, std::forward<P>(obj));`
 *Remarks:* This signature shall not participate in overload resolution
+unless `is_constructible_v<value_type, P&&>` is `true`.
+``` cpp
+template <class... Args>
+  pair<iterator, bool> try_emplace(const key_type& k, Args&&... args);
+template <class... Args>
+  iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args);
+```
+*Requires:* `value_type` shall be `EmplaceConstructible` into
+`unordered_map` from `piecewise_construct`, `forward_as_tuple(k)`,
+`forward_as_tuple(std::forward<Args>(args)...)`.
+*Effects:* If the map already contains an element whose key is
+equivalent to `k`, there is no effect. Otherwise inserts an object of
+type `value_type` constructed with `piecewise_construct`,
+`forward_as_tuple(k)`, `forward_as_tuple(std::forward<Args>(args)...)`.
+*Returns:* In the first overload, the `bool` component of the returned
+pair is `true` if and only if the insertion took place. The returned
+iterator points to the map element whose key is equivalent to `k`.
+*Complexity:* The same as `emplace` and `emplace_hint`, respectively.
+``` cpp
+template <class... Args>
+  pair<iterator, bool> try_emplace(key_type&& k, Args&&... args);
+template <class... Args>
+  iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args);
+```
+*Requires:* `value_type` shall be `EmplaceConstructible` into
+`unordered_map` from `piecewise_construct`,
+`forward_as_tuple(std::move(k))`,
+`forward_as_tuple(std::forward<Args>(args)...)`.
+*Effects:* If the map already contains an element whose key is
+equivalent to `k`, there is no effect. Otherwise inserts an object of
+type `value_type` constructed with `piecewise_construct`,
+`forward_as_tuple(std::move(k))`,
+`forward_as_tuple(std::forward<Args>(args)...)`.
+*Returns:* In the first overload, the `bool` component of the returned
+pair is `true` if and only if the insertion took place. The returned
+iterator points to the map element whose key is equivalent to `k`.
+*Complexity:* The same as `emplace` and `emplace_hint`, respectively.
+``` cpp
+template <class M>
+  pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj);
+template <class M>
+  iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj);
+```
+*Requires:* `is_assignable_v<mapped_type&, M&&>` shall be `true`.
+`value_type` shall be `EmplaceConstructible` into `unordered_map` from
+`k`, `std::forward<M>(obj)`.
+*Effects:* If the map already contains an element `e` whose key is
+equivalent to `k`, assigns `std::forward<M>(obj)` to `e.second`.
+Otherwise inserts an object of type `value_type` constructed with `k`,
+`std::forward<M>(obj)`.
+*Returns:* In the first overload, the `bool` component of the returned
+pair is `true` if and only if the insertion took place. The returned
+iterator points to the map element whose key is equivalent to `k`.
+*Complexity:* The same as `emplace` and `emplace_hint`, respectively.
+``` cpp
+template <class M>
+  pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj);
+template <class M>
+  iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj);
+```
+*Requires:* `is_assignable_v<mapped_type&, M&&>` shall be `true`.
+`value_type` shall be `EmplaceConstructible` into `unordered_map` from
+`std::move(k)`, `std::forward<M>(obj)`.
+*Effects:* If the map already contains an element `e` whose key is
+equivalent to `k`, assigns `std::forward<M>(obj)` to `e.second`.
+Otherwise inserts an object of type `value_type` constructed with
+`std::move(k)`, `std::forward<M>(obj)`.
+*Returns:* In the first overload, the `bool` component of the returned
+pair is `true` if and only if the insertion took place. The returned
+iterator points to the map element whose key is equivalent to `k`.
+*Complexity:* The same as `emplace` and `emplace_hint`, respectively.
 #### `unordered_map` swap <a id="unord.map.swap">[[unord.map.swap]]</a>
 ``` cpp
 template <class Key, class T, class Hash, class Pred, class Alloc>
   void swap(unordered_map<Key, T, Hash, Pred, Alloc>& x,
+            unordered_map<Key, T, Hash, Pred, Alloc>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class template `unordered_multimap` <a id="unord.multimap">[[unord.multimap]]</a>
 #### Class template `unordered_multimap` overview <a id="unord.multimap.overview">[[unord.multimap.overview]]</a>
 allocator-aware container (Table  [[tab:containers.allocatoraware]]). It
 provides the operations described in the preceding requirements table
 for equivalent keys; that is, an `unordered_multimap` supports the
 `a_eq` operations in that table, not the `a_uniq` operations. For an
 `unordered_multimap<Key, T>` the `key type` is `Key`, the mapped type is
+`T`, and the value type is `pair<const Key, T>`.
 This section only describes operations on `unordered_multimap` that are
 not described in one of the requirement tables, or for which there is
 additional semantic information.
 ``` cpp
 namespace std {
   template <class Key,
             class T,
             class Hash = hash<Key>,
+            class Pred = equal_to<Key>,
+            class Allocator = allocator<pair<const Key, T>>>
+  class unordered_multimap {
   public:
+    // types:
+ using key_type             = Key;
+ using mapped_type          = T;
+ using value_type           = pair<const Key, T>;
+ using hasher               = Hash;
+ using key_equal            = Pred;
+ using allocator_type       = Allocator;
+ using pointer              = typename allocator_traits<Allocator>::pointer;
+ using const_pointer        = typename allocator_traits<Allocator>::const_pointer;
+ using reference            = value_type&;
+ using const_reference      = const value_type&;
+ using size_type            = implementation-defined; // see [container.requirements]
+ using difference_type      = implementation-defined; // see [container.requirements]
+ using iterator             = implementation-defined  // type of unordered_multimap::iterator; // see [container.requirements]
+ using const_iterator       = implementation-defined  // type of unordered_multimap::const_iterator; // see [container.requirements]
+ using local_iterator       = implementation-defined  // type of unordered_multimap::local_iterator; // see [container.requirements]
+ using const_local_iterator = implementation-defined  // type of unordered_multimap::const_local_iterator; // see [container.requirements]
+    using node_type            = unspecified;
+    // [unord.multimap.cnstr], construct/copy/destroy
     unordered_multimap();
     explicit unordered_multimap(size_type n,
                                 const hasher& hf = hasher(),
                                 const key_equal& eql = key_equal(),
                                 const allocator_type& a = allocator_type());
     unordered_multimap(const unordered_multimap&);
     unordered_multimap(unordered_multimap&&);
     explicit unordered_multimap(const Allocator&);
     unordered_multimap(const unordered_multimap&, const Allocator&);
     unordered_multimap(unordered_multimap&&, const Allocator&);
+    unordered_multimap(initializer_list<value_type> il,
+ size_type n = see below,
                        const hasher& hf = hasher(),
                        const key_equal& eql = key_equal(),
                        const allocator_type& a = allocator_type());
     unordered_multimap(size_type n, const allocator_type& a)
       : unordered_multimap(n, hasher(), key_equal(), a) { }
     unordered_multimap(initializer_list<value_type> il, size_type n, const hasher& hf,
                        const allocator_type& a)
       : unordered_multimap(il, n, hf, key_equal(), a) { }
     ~unordered_multimap();
     unordered_multimap& operator=(const unordered_multimap&);
+    unordered_multimap& operator=(unordered_multimap&&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_move_assignable_v<Hash> &&
+               is_nothrow_move_assignable_v<Pred>);
     unordered_multimap& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
+    // iterators:
     iterator       begin() noexcept;
     const_iterator begin() const noexcept;
     iterator       end() noexcept;
     const_iterator end() const noexcept;
     const_iterator cbegin() const noexcept;
     const_iterator cend() const noexcept;
+    // capacity:
+    bool      empty() const noexcept;
+    size_type size() const noexcept;
+    size_type max_size() const noexcept;
+    // [unord.multimap.modifiers], modifiers
     template <class... Args> iterator emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     iterator insert(const value_type& obj);
+    iterator insert(value_type&& obj);
     template <class P> iterator insert(P&& obj);
     iterator insert(const_iterator hint, const value_type& obj);
+    iterator insert(const_iterator hint, value_type&& obj);
     template <class P> iterator insert(const_iterator hint, P&& obj);
     template <class InputIterator> void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
+    node_type extract(const_iterator position);
+    node_type extract(const key_type& x);
+    iterator insert(node_type&& nh);
+    iterator insert(const_iterator hint, node_type&& nh);
+    iterator  erase(iterator position);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
+    void      swap(unordered_multimap&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_swappable_v<Hash> &&
+               is_nothrow_swappable_v<Pred>);
     void      clear() noexcept;
+ template<class H2, class P2>
+      void merge(unordered_multimap<Key, T, H2, P2, Allocator>& source);
+    template<class H2, class P2>
+      void merge(unordered_multimap<Key, T, H2, P2, Allocator>&& source);
+    template<class H2, class P2>
+      void merge(unordered_map<Key, T, H2, P2, Allocator>& source);
+    template<class H2, class P2>
+      void merge(unordered_map<Key, T, H2, P2, Allocator>&& source);
+    // observers:
     hasher hash_function() const;
     key_equal key_eq() const;
+    // map operations:
     iterator       find(const key_type& k);
     const_iterator find(const key_type& k) const;
     size_type      count(const key_type& k) const;
+    pair<iterator, iterator>             equal_range(const key_type& k);
+    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
+    // bucket interface:
     size_type bucket_count() const noexcept;
     size_type max_bucket_count() const noexcept;
     size_type bucket_size(size_type n) const;
     size_type bucket(const key_type& k) const;
     local_iterator begin(size_type n);
     void max_load_factor(float z);
     void rehash(size_type n);
     void reserve(size_type n);
   };
+  template<class InputIterator,
+           class Hash = hash<iter_key_t<InputIterator>>,
+           class Pred = equal_to<iter_key_t<InputIterator>>,
+           class Allocator = allocator<iter_to_alloc_t<InputIterator>>>
+    unordered_multimap(InputIterator, InputIterator,
+                       typename see below::size_type = see below,
+                       Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> unordered_multimap<iter_key_t<InputIterator>, iter_value_t<InputIterator>, Hash, Pred,
+                            Allocator>;
+  template<class Key, class T, class Hash = hash<Key>,
+           class Pred = equal_to<Key>, class Allocator = allocator<pair<const Key, T>>>
+    unordered_multimap(initializer_list<pair<const Key, T>>,
+                       typename see below::size_type = see below,
+                       Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> unordered_multimap<Key, T, Hash, Pred, Allocator>;
+  template<class InputIterator, class Allocator>
+    unordered_multimap(InputIterator, InputIterator, typename see below::size_type, Allocator)
+      -> unordered_multimap<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+                            hash<iter_key_t<InputIterator>>,
+                            equal_to<iter_key_t<InputIterator>>, Allocator>;
+  template<class InputIterator, class Allocator>
+    unordered_multimap(InputIterator, InputIterator, Allocator)
+      -> unordered_multimap<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+                            hash<iter_key_t<InputIterator>>,
+                            equal_to<iter_key_t<InputIterator>>, Allocator>;
+  template<class InputIterator, class Hash, class Allocator>
+    unordered_multimap(InputIterator, InputIterator, typename see below::size_type, Hash,
+                       Allocator)
+      -> unordered_multimap<iter_key_t<InputIterator>, iter_val_t<InputIterator>, Hash,
+                            equal_to<iter_key_t<InputIterator>>, Allocator>;
+  template<class Key, class T, typename Allocator>
+    unordered_multimap(initializer_list<pair<const Key, T>>, typename see below::size_type,
+                       Allocator)
+      -> unordered_multimap<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+  template<class Key, class T, typename Allocator>
+    unordered_multimap(initializer_list<pair<const Key, T>>, Allocator)
+      -> unordered_multimap<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+  template<class Key, class T, class Hash, class Allocator>
+    unordered_multimap(initializer_list<pair<const Key, T>>, typename see below::size_type,
+                       Hash, Allocator)
+      -> unordered_multimap<Key, T, Hash, equal_to<Key>, Allocator>;
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_multimap<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_multimap<Key, T, Hash, Pred, Alloc>& b);
   template <class Key, class T, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_multimap<Key, T, Hash, Pred, Alloc>& a,
                     const unordered_multimap<Key, T, Hash, Pred, Alloc>& b);
+  // [unord.multimap.swap], swap
+  template <class Key, class T, class Hash, class Pred, class Alloc>
+    void swap(unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
+              unordered_multimap<Key, T, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
+A `size_type` parameter type in an `unordered_multimap` deduction guide
+refers to the `size_type` member type of the type deduced by the
+deduction guide.
 #### `unordered_multimap` constructors <a id="unord.multimap.cnstr">[[unord.multimap.cnstr]]</a>
 ``` cpp
 unordered_multimap() : unordered_multimap(size_type(see below)) { }
 explicit unordered_multimap(size_type n,
                             const key_equal& eql = key_equal(),
                             const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_multimap` using the specified
+hash function, key equality predicate, and allocator, and using at least
+`n` buckets. For the default constructor, the number of buckets is
+*implementation-defined*. `max_load_factor()` returns `1.0`.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   unordered_multimap(InputIterator f, InputIterator l,
                      size_type n = see below,
                      const hasher& hf = hasher(),
                      const key_equal& eql = key_equal(),
                      const allocator_type& a = allocator_type());
+unordered_multimap(initializer_list<value_type> il,
+                   size_type n = see below,
+                   const hasher& hf = hasher(),
+                   const key_equal& eql = key_equal(),
+                   const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_multimap` using the specified
+hash function, key equality predicate, and allocator, and using at least
+`n` buckets. If `n` is not provided, the number of buckets is
+*implementation-defined*. Then inserts elements from the range \[`f`,
+`l`) for the first form, or from the range \[`il.begin()`, `il.end()`)
+for the second form. `max_load_factor()` returns `1.0`.
 *Complexity:* Average case linear, worst case quadratic.
 #### `unordered_multimap` modifiers <a id="unord.multimap.modifiers">[[unord.multimap.modifiers]]</a>
 ``` cpp
 template <class P>
   iterator insert(P&& obj);
 ```
+*Effects:* Equivalent to: `return emplace(std::forward<P>(obj));`
 *Remarks:* This signature shall not participate in overload resolution
+unless `is_constructible_v<value_type, P&&>` is `true`.
 ``` cpp
 template <class P>
   iterator insert(const_iterator hint, P&& obj);
 ```
+*Effects:* Equivalent to:
+`return emplace_hint(hint, std::forward<P>(obj));`
 *Remarks:* This signature shall not participate in overload resolution
+unless `is_constructible_v<value_type, P&&>` is `true`.
 #### `unordered_multimap` swap <a id="unord.multimap.swap">[[unord.multimap.swap]]</a>
 ``` cpp
 template <class Key, class T, class Hash, class Pred, class Alloc>
   void swap(unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
+            unordered_multimap<Key, T, Hash, Pred, Alloc>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class template `unordered_set` <a id="unord.set">[[unord.set]]</a>
 #### Class template `unordered_set` overview <a id="unord.set.overview">[[unord.set.overview]]</a>
 (Table  [[tab:containers.allocatoraware]]). It provides the operations
 described in the preceding requirements table for unique keys; that is,
 an `unordered_set` supports the `a_uniq` operations in that table, not
 the `a_eq` operations. For an `unordered_set<Key>` the `key type` and
 the value type are both `Key`. The `iterator` and `const_iterator` types
+are both constant iterator types. It is unspecified whether they are the
 same type.
 This section only describes operations on `unordered_set` that are not
 described in one of the requirement tables, or for which there is
 additional semantic information.
 ``` cpp
 namespace std {
   template <class Key,
             class Hash = hash<Key>,
+            class Pred = equal_to<Key>,
+            class Allocator = allocator<Key>>
+  class unordered_set {
   public:
+    // types:
+ using key_type             = Key;
+ using value_type           = Key;
+ using hasher               = Hash;
+ using key_equal            = Pred;
+ using allocator_type       = Allocator;
+ using pointer              = typename allocator_traits<Allocator>::pointer;
+ using const_pointer        = typename allocator_traits<Allocator>::const_pointer;
+ using reference            = value_type&;
+ using const_reference      = const value_type&;
+ using size_type            = implementation-defined; // see [container.requirements]
+ using difference_type      = implementation-defined; // see [container.requirements]
+ using iterator             = implementation-defined  // type of unordered_set::iterator; // see [container.requirements]
+ using const_iterator       = implementation-defined  // type of unordered_set::const_iterator; // see [container.requirements]
+ using local_iterator       = implementation-defined  // type of unordered_set::local_iterator; // see [container.requirements]
+ using const_local_iterator = implementation-defined  // type of unordered_set::const_local_iterator; // see [container.requirements]
+    using node_type            = unspecified;
+    using insert_return_type   = INSERT_RETURN_TYPE<iterator, node_type>;
+    // [unord.set.cnstr], construct/copy/destroy
     unordered_set();
     explicit unordered_set(size_type n,
                            const hasher& hf = hasher(),
                            const key_equal& eql = key_equal(),
                            const allocator_type& a = allocator_type());
     unordered_set(const unordered_set&);
     unordered_set(unordered_set&&);
     explicit unordered_set(const Allocator&);
     unordered_set(const unordered_set&, const Allocator&);
     unordered_set(unordered_set&&, const Allocator&);
+    unordered_set(initializer_list<value_type> il,
+ size_type n = see below,
                   const hasher& hf = hasher(),
                   const key_equal& eql = key_equal(),
                   const allocator_type& a = allocator_type());
     unordered_set(size_type n, const allocator_type& a)
       : unordered_set(n, hasher(), key_equal(), a) { }
     unordered_set(initializer_list<value_type> il, size_type n, const hasher& hf,
                   const allocator_type& a)
       : unordered_set(il, n, hf, key_equal(), a) { }
     ~unordered_set();
     unordered_set& operator=(const unordered_set&);
+    unordered_set& operator=(unordered_set&&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_move_assignable_v<Hash> &&
+               is_nothrow_move_assignable_v<Pred>);
     unordered_set& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
+    // iterators:
     iterator       begin() noexcept;
     const_iterator begin() const noexcept;
     iterator       end() noexcept;
     const_iterator end() const noexcept;
     const_iterator cbegin() const noexcept;
     const_iterator cend() const noexcept;
+    // capacity:
+    bool      empty() const noexcept;
+    size_type size() const noexcept;
+    size_type max_size() const noexcept;
+    // modifiers:
     template <class... Args> pair<iterator, bool> emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     pair<iterator, bool> insert(const value_type& obj);
     pair<iterator, bool> insert(value_type&& obj);
     iterator insert(const_iterator hint, const value_type& obj);
     iterator insert(const_iterator hint, value_type&& obj);
     template <class InputIterator> void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
+    node_type extract(const_iterator position);
+    node_type extract(const key_type& x);
+    insert_return_type insert(node_type&& nh);
+    iterator           insert(const_iterator hint, node_type&& nh);
+    iterator  erase(iterator position);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
+    void      swap(unordered_set&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_swappable_v<Hash> &&
+               is_nothrow_swappable_v<Pred>);
     void      clear() noexcept;
+ template<class H2, class P2>
+      void merge(unordered_set<Key, H2, P2, Allocator>& source);
+    template<class H2, class P2>
+      void merge(unordered_set<Key, H2, P2, Allocator>&& source);
+    template<class H2, class P2>
+      void merge(unordered_multiset<Key, H2, P2, Allocator>& source);
+    template<class H2, class P2>
+      void merge(unordered_multiset<Key, H2, P2, Allocator>&& source);
+    // observers:
     hasher hash_function() const;
     key_equal key_eq() const;
+    // set operations:
     iterator       find(const key_type& k);
     const_iterator find(const key_type& k) const;
     size_type      count(const key_type& k) const;
+    pair<iterator, iterator>             equal_range(const key_type& k);
+    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
+    // bucket interface:
     size_type bucket_count() const noexcept;
     size_type max_bucket_count() const noexcept;
     size_type bucket_size(size_type n) const;
     size_type bucket(const key_type& k) const;
     local_iterator begin(size_type n);
     local_iterator end(size_type n);
     const_local_iterator end(size_type n) const;
     const_local_iterator cbegin(size_type n) const;
     const_local_iterator cend(size_type n) const;
+    // hash policy:
     float load_factor() const noexcept;
     float max_load_factor() const noexcept;
     void max_load_factor(float z);
     void rehash(size_type n);
     void reserve(size_type n);
   };
+  template<class InputIterator,
+           class Hash = hash<typename iterator_traits<InputIterator>::value_type>,
+           class Pred = equal_to<typename iterator_traits<InputIterator>::value_type>,
+           class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+    unordered_set(InputIterator, InputIterator, typename see below::size_type = see below,
+                  Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> unordered_set<typename iterator_traits<InputIterator>::value_type,
+                       Hash, Pred, Allocator>;
+  template<class T, class Hash = hash<T>,
+           class Pred = equal_to<T>, class Allocator = allocator<T>>
+    unordered_set(initializer_list<T>, typename see below::size_type = see below,
+                  Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> unordered_set<T, Hash, Pred, Allocator>;
+  template<class InputIterator, class Allocator>
+    unordered_set(InputIterator, InputIterator, typename see below::size_type, Allocator)
+      -> unordered_set<typename iterator_traits<InputIterator>::value_type,
+                       hash<typename iterator_traits<InputIterator>::value_type>,
+                       equal_to<typename iterator_traits<InputIterator>::value_type>,
+                       Allocator>;
+  template<class InputIterator, class Hash, class Allocator>
+    unordered_set(InputIterator, InputIterator, typename see below::size_type,
+                  Hash, Allocator)
+      -> unordered_set<typename iterator_traits<InputIterator>::value_type, Hash,
+                       equal_to<typename iterator_traits<InputIterator>::value_type>,
+                       Allocator>;
+  template<class T, class Allocator>
+    unordered_set(initializer_list<T>, typename see below::size_type, Allocator)
+      -> unordered_set<T, hash<T>, equal_to<T>, Allocator>;
+  template<class T, class Hash, class Allocator>
+    unordered_set(initializer_list<T>, typename see below::size_type, Hash, Allocator)
+      -> unordered_set<T, Hash, equal_to<T>, Allocator>;
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_set<Key, Hash, Pred, Alloc>& a,
                     const unordered_set<Key, Hash, Pred, Alloc>& b);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_set<Key, Hash, Pred, Alloc>& a,
                     const unordered_set<Key, Hash, Pred, Alloc>& b);
+  // [unord.set.swap], swap
+  template <class Key, class Hash, class Pred, class Alloc>
+    void swap(unordered_set<Key, Hash, Pred, Alloc>& x,
+              unordered_set<Key, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
+A `size_type` parameter type in an `unordered_set` deduction guide
+refers to the `size_type` member type of the primary `unordered_set`
+template.
 #### `unordered_set` constructors <a id="unord.set.cnstr">[[unord.set.cnstr]]</a>
 ``` cpp
 unordered_set() : unordered_set(size_type(see below)) { }
 explicit unordered_set(size_type n,
                        const key_equal& eql = key_equal(),
                        const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_set` using the specified hash
+function, key equality predicate, and allocator, and using at least `n`
 buckets. For the default constructor, the number of buckets is
+*implementation-defined*. `max_load_factor()` returns `1.0`.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   unordered_set(InputIterator f, InputIterator l,
                 size_type n = see below,
                 const hasher& hf = hasher(),
                 const key_equal& eql = key_equal(),
                 const allocator_type& a = allocator_type());
+unordered_set(initializer_list<value_type> il,
+              size_type n = see below,
+              const hasher& hf = hasher(),
+              const key_equal& eql = key_equal(),
+              const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_set` using the specified hash
+function, key equality predicate, and allocator, and using at least `n`
+buckets. If `n` is not provided, the number of buckets is
+*implementation-defined*. Then inserts elements from the range \[`f`,
+`l`) for the first form, or from the range \[`il.begin()`, `il.end()`)
+for the second form. `max_load_factor()` returns `1.0`.
 *Complexity:* Average case linear, worst case quadratic.
 #### `unordered_set` swap <a id="unord.set.swap">[[unord.set.swap]]</a>
 ``` cpp
 template <class Key, class Hash, class Pred, class Alloc>
   void swap(unordered_set<Key, Hash, Pred, Alloc>& x,
+            unordered_set<Key, Hash, Pred, Alloc>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ### Class template `unordered_multiset` <a id="unord.multiset">[[unord.multiset]]</a>
 #### Class template `unordered_multiset` overview <a id="unord.multiset.overview">[[unord.multiset.overview]]</a>
 allocator-aware container (Table  [[tab:containers.allocatoraware]]). It
 provides the operations described in the preceding requirements table
 for equivalent keys; that is, an `unordered_multiset` supports the
 `a_eq` operations in that table, not the `a_uniq` operations. For an
 `unordered_multiset<Key>` the `key type` and the value type are both
+`Key`. The `iterator` and `const_iterator` types are both constant
+iterator types. It is unspecified whether they are the same type.
 This section only describes operations on `unordered_multiset` that are
 not described in one of the requirement tables, or for which there is
 additional semantic information.
 ``` cpp
 namespace std {
   template <class Key,
             class Hash = hash<Key>,
+            class Pred = equal_to<Key>,
+            class Allocator = allocator<Key>>
+  class unordered_multiset {
   public:
+    // types:
+ using key_type             = Key;
+ using value_type           = Key;
+ using hasher               = Hash;
+ using key_equal            = Pred;
+ using allocator_type       = Allocator;
+ using pointer              = typename allocator_traits<Allocator>::pointer;
+ using const_pointer        = typename allocator_traits<Allocator>::const_pointer;
+ using reference            = value_type&;
+ using const_reference      = const value_type&;
+ using size_type            = implementation-defined; // see [container.requirements]
+ using difference_type      = implementation-defined; // see [container.requirements]
+ using iterator             = implementation-defined  // type of unordered_multiset::iterator; // see [container.requirements]
+ using const_iterator       = implementation-defined  // type of unordered_multiset::const_iterator; // see [container.requirements]
+ using local_iterator       = implementation-defined  // type of unordered_multiset::local_iterator; // see [container.requirements]
+ using const_local_iterator = implementation-defined  // type of unordered_multiset::const_local_iterator; // see [container.requirements]
+    using node_type            = unspecified;
+    // [unord.multiset.cnstr], construct/copy/destroy
     unordered_multiset();
     explicit unordered_multiset(size_type n,
                                 const hasher& hf = hasher(),
                                 const key_equal& eql = key_equal(),
                                 const allocator_type& a = allocator_type());
     unordered_multiset(const unordered_multiset&);
     unordered_multiset(unordered_multiset&&);
     explicit unordered_multiset(const Allocator&);
     unordered_multiset(const unordered_multiset&, const Allocator&);
     unordered_multiset(unordered_multiset&&, const Allocator&);
+    unordered_multiset(initializer_list<value_type> il,
+ size_type n = see below,
                        const hasher& hf = hasher(),
                        const key_equal& eql = key_equal(),
                        const allocator_type& a = allocator_type());
     unordered_multiset(size_type n, const allocator_type& a)
       : unordered_multiset(n, hasher(), key_equal(), a) { }
     unordered_multiset(initializer_list<value_type> il, size_type n, const hasher& hf,
                        const allocator_type& a)
       : unordered_multiset(il, n, hf, key_equal(), a) { }
     ~unordered_multiset();
     unordered_multiset& operator=(const unordered_multiset&);
+    unordered_multiset& operator=(unordered_multiset&&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_move_assignable_v<Hash> &&
+               is_nothrow_move_assignable_v<Pred>);
     unordered_multiset& operator=(initializer_list<value_type>);
     allocator_type get_allocator() const noexcept;
+    // iterators:
     iterator       begin() noexcept;
     const_iterator begin() const noexcept;
     iterator       end() noexcept;
     const_iterator end() const noexcept;
     const_iterator cbegin() const noexcept;
     const_iterator cend() const noexcept;
+    // capacity:
+    bool      empty() const noexcept;
+    size_type size() const noexcept;
+    size_type max_size() const noexcept;
+    // modifiers:
     template <class... Args> iterator emplace(Args&&... args);
     template <class... Args> iterator emplace_hint(const_iterator position, Args&&... args);
     iterator insert(const value_type& obj);
     iterator insert(value_type&& obj);
     iterator insert(const_iterator hint, const value_type& obj);
     iterator insert(const_iterator hint, value_type&& obj);
     template <class InputIterator> void insert(InputIterator first, InputIterator last);
     void insert(initializer_list<value_type>);
+    node_type extract(const_iterator position);
+    node_type extract(const key_type& x);
+    iterator insert(node_type&& nh);
+    iterator insert(const_iterator hint, node_type&& nh);
+    iterator  erase(iterator position);
     iterator  erase(const_iterator position);
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
+    void      swap(unordered_multiset&)
+      noexcept(allocator_traits<Allocator>::is_always_equal::value &&
+               is_nothrow_swappable_v<Hash> &&
+               is_nothrow_swappable_v<Pred>);
     void      clear() noexcept;
+ template<class H2, class P2>
+      void merge(unordered_multiset<Key, H2, P2, Allocator>& source);
+    template<class H2, class P2>
+      void merge(unordered_multiset<Key, H2, P2, Allocator>&& source);
+    template<class H2, class P2>
+      void merge(unordered_set<Key, H2, P2, Allocator>& source);
+    template<class H2, class P2>
+      void merge(unordered_set<Key, H2, P2, Allocator>&& source);
+    // observers:
     hasher hash_function() const;
     key_equal key_eq() const;
+    // set operations:
     iterator       find(const key_type& k);
     const_iterator find(const key_type& k) const;
     size_type      count(const key_type& k) const;
+    pair<iterator, iterator>             equal_range(const key_type& k);
+    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
+    // bucket interface:
     size_type bucket_count() const noexcept;
     size_type max_bucket_count() const noexcept;
     size_type bucket_size(size_type n) const;
     size_type bucket(const key_type& k) const;
     local_iterator begin(size_type n);
     local_iterator end(size_type n);
     const_local_iterator end(size_type n) const;
     const_local_iterator cbegin(size_type n) const;
     const_local_iterator cend(size_type n) const;
+    // hash policy:
     float load_factor() const noexcept;
     float max_load_factor() const noexcept;
     void max_load_factor(float z);
     void rehash(size_type n);
     void reserve(size_type n);
   };
+  template<class InputIterator,
+           class Hash = hash<typename iterator_traits<InputIterator>::value_type>,
+           class Pred = equal_to<typename iterator_traits<InputIterator>::value_type>,
+           class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+    unordered_multiset(InputIterator, InputIterator, see below::size_type = see below,
+                       Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> unordered_multiset<typename iterator_traits<InputIterator>::value_type,
+                            Hash, Pred, Allocator>;
+  template<class T, class Hash = hash<T>,
+           class Pred = equal_to<T>, class Allocator = allocator<T>>
+    unordered_multiset(initializer_list<T>, typename see below::size_type = see below,
+                       Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> unordered_multiset<T, Hash, Pred, Allocator>;
+  template<class InputIterator, class Allocator>
+    unordered_multiset(InputIterator, InputIterator, typename see below::size_type, Allocator)
+      -> unordered_multiset<typename iterator_traits<InputIterator>::value_type,
+                            hash<typename iterator_traits<InputIterator>::value_type>,
+                            equal_to<typename iterator_traits<InputIterator>::value_type>,
+                            Allocator>;
+  template<class InputIterator, class Hash, class Allocator>
+    unordered_multiset(InputIterator, InputIterator, typename see below::size_type,
+                       Hash, Allocator)
+      -> unordered_multiset<typename iterator_traits<InputIterator>::value_type, Hash,
+                            equal_to<typename iterator_traits<InputIterator>::value_type>,
+                            Allocator>;
+  template<class T, class Allocator>
+    unordered_multiset(initializer_list<T>, typename see below::size_type, Allocator)
+      -> unordered_multiset<T, hash<T>, equal_to<T>, Allocator>;
+  template<class T, class Hash, class Allocator>
+    unordered_multiset(initializer_list<T>, typename see below::size_type, Hash, Allocator)
+      -> unordered_multiset<T, Hash, equal_to<T>, Allocator>;
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator==(const unordered_multiset<Key, Hash, Pred, Alloc>& a,
                     const unordered_multiset<Key, Hash, Pred, Alloc>& b);
   template <class Key, class Hash, class Pred, class Alloc>
     bool operator!=(const unordered_multiset<Key, Hash, Pred, Alloc>& a,
                     const unordered_multiset<Key, Hash, Pred, Alloc>& b);
+  // [unord.multiset.swap], swap
+  template <class Key, class Hash, class Pred, class Alloc>
+    void swap(unordered_multiset<Key, Hash, Pred, Alloc>& x,
+              unordered_multiset<Key, Hash, Pred, Alloc>& y)
+      noexcept(noexcept(x.swap(y)));
 }
 ```
+A `size_type` parameter type in an `unordered_multiset` deduction guide
+refers to the `size_type` member type of the primary
+`unordered_multiset` template.
 #### `unordered_multiset` constructors <a id="unord.multiset.cnstr">[[unord.multiset.cnstr]]</a>
 ``` cpp
 unordered_multiset() : unordered_multiset(size_type(see below)) { }
 explicit unordered_multiset(size_type n,
                             const key_equal& eql = key_equal(),
                             const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_multiset` using the specified
+hash function, key equality predicate, and allocator, and using at least
+`n` buckets. For the default constructor, the number of buckets is
+*implementation-defined*. `max_load_factor()` returns `1.0`.
 *Complexity:* Constant.
 ``` cpp
 template <class InputIterator>
   unordered_multiset(InputIterator f, InputIterator l,
                      size_type n = see below,
                      const hasher& hf = hasher(),
                      const key_equal& eql = key_equal(),
                      const allocator_type& a = allocator_type());
+unordered_multiset(initializer_list<value_type> il,
+                   size_type n = see below,
+                   const hasher& hf = hasher(),
+                   const key_equal& eql = key_equal(),
+                   const allocator_type& a = allocator_type());
 ```
 *Effects:* Constructs an empty `unordered_multiset` using the specified
+hash function, key equality predicate, and allocator, and using at least
+`n` buckets. If `n` is not provided, the number of buckets is
+*implementation-defined*. Then inserts elements from the range \[`f`,
+`l`) for the first form, or from the range \[`il.begin()`, `il.end()`)
+for the second form. `max_load_factor()` returns `1.0`.
 *Complexity:* Average case linear, worst case quadratic.
 #### `unordered_multiset` swap <a id="unord.multiset.swap">[[unord.multiset.swap]]</a>
 ``` cpp
 template <class Key, class Hash, class Pred, class Alloc>
   void swap(unordered_multiset<Key, Hash, Pred, Alloc>& x,
+            unordered_multiset<Key, Hash, Pred, Alloc>& y)
+    noexcept(noexcept(x.swap(y)));
 ```
+*Effects:* As if by `x.swap(y)`.
 ## Container adaptors <a id="container.adaptors">[[container.adaptors]]</a>
 ### In general <a id="container.adaptors.general">[[container.adaptors.general]]</a>
 The container adaptors each take a `Container` template parameter, and
 each constructor takes a `Container` reference argument. This container
 is copied into the `Container` member of each adaptor. If the container
 takes an allocator, then a compatible allocator may be passed in to the
 adaptor’s constructor. Otherwise, normal copy or move construction is
+used for the container argument. The first template parameter `T` of the
+container adaptors shall denote the same type as
+`Container::value_type`.
 For container adaptors, no `swap` function throws an exception unless
 that exception is thrown by the swap of the adaptor’s `Container` or
 `Compare` object (if any).
+A deduction guide for a container adaptor shall not participate in
+overload resolution if any of the following are true:
+- It has an `InputIterator` template parameter and a type that does not
+  qualify as an input iterator is deduced for that parameter.
+- It has a `Compare` template parameter and a type that qualifies as an
+  allocator is deduced for that parameter.
+- It has a `Container` template parameter and a type that qualifies as
+  an allocator is deduced for that parameter.
+- It has an `Allocator` template parameter and a type that does not
+  qualify as an allocator is deduced for that parameter.
+- It has both `Container` and `Allocator` template parameters, and
+  `uses_allocator_v<Container, Allocator>` is `false`.
 ### Header `<queue>` synopsis <a id="queue.syn">[[queue.syn]]</a>
 ``` cpp
 #include <initializer_list>
 namespace std {
   template <class T, class Container = deque<T>> class queue;
   template <class T, class Container = vector<T>,
             class Compare = less<typename Container::value_type>>
     class priority_queue;
     void swap(priority_queue<T, Container, Compare>& x,
               priority_queue<T, Container, Compare>& y) noexcept(noexcept(x.swap(y)));
 }
 ```
+### Header `<stack>` synopsis <a id="stack.syn">[[stack.syn]]</a>
+``` cpp
+#include <initializer_list>
+namespace std {
+  template <class T, class Container = deque<T>> class stack;
+  template <class T, class Container>
+    bool operator==(const stack<T, Container>& x, const stack<T, Container>& y);
+  template <class T, class Container>
+    bool operator< (const stack<T, Container>& x, const stack<T, Container>& y);
+  template <class T, class Container>
+    bool operator!=(const stack<T, Container>& x, const stack<T, Container>& y);
+  template <class T, class Container>
+    bool operator> (const stack<T, Container>& x, const stack<T, Container>& y);
+  template <class T, class Container>
+    bool operator>=(const stack<T, Container>& x, const stack<T, Container>& y);
+  template <class T, class Container>
+    bool operator<=(const stack<T, Container>& x, const stack<T, Container>& y);
+  template <class T, class Container>
+    void swap(stack<T, Container>& x, stack<T, Container>& y) noexcept(noexcept(x.swap(y)));
+}
+```
 ### Class template `queue` <a id="queue">[[queue]]</a>
 #### `queue` definition <a id="queue.defn">[[queue.defn]]</a>
 Any sequence container supporting operations `front()`, `back()`,
 ``` cpp
 namespace std {
   template <class T, class Container = deque<T>>
   class queue {
   public:
+ using value_type      = typename Container::value_type;
+ using reference       = typename Container::reference;
+ using const_reference = typename Container::const_reference;
+ using size_type       = typename Container::size_type;
+ using container_type  =          Container;
   protected:
     Container c;
   public:
     explicit queue(const Container&);
     const_reference   front() const     { return c.front(); }
     reference         back()            { return c.back(); }
     const_reference   back() const      { return c.back(); }
     void push(const value_type& x)      { c.push_back(x); }
     void push(value_type&& x)           { c.push_back(std::move(x)); }
+    template <class... Args>
+ reference emplace(Args&&... args) { return c.emplace_back(std::forward<Args>(args)...); }
     void pop()                          { c.pop_front(); }
+    void swap(queue& q) noexcept(is_nothrow_swappable_v<Container>)
       { using std::swap; swap(c, q.c); }
   };
+  template<class Container>
+    queue(Container) -> queue<typename Container::value_type, Container>;
+  template<class Container, class Allocator>
+    queue(Container, Allocator) -> queue<typename Container::value_type, Container>;
   template <class T, class Container>
     bool operator==(const queue<T, Container>& x, const queue<T, Container>& y);
   template <class T, class Container>
     bool operator< (const queue<T, Container>& x, const queue<T, Container>& y);
   template <class T, class Container>
 *Effects:*  Initializes `c` with `std::move(cont)`.
 #### `queue` constructors with allocators <a id="queue.cons.alloc">[[queue.cons.alloc]]</a>
+If `uses_allocator_v<container_type, Alloc>` is `false` the constructors
+in this subclause shall not participate in overload resolution.
 ``` cpp
+template <class Alloc> explicit queue(const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `a`.
 ``` cpp
+template <class Alloc> queue(const container_type& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `cont` as the first argument and `a` as
 the second argument.
 ``` cpp
+template <class Alloc> queue(container_type&& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(cont)` as the first argument
 and `a` as the second argument.
 ``` cpp
+template <class Alloc> queue(const queue& q, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `q.c` as the first argument and `a` as
 the second argument.
 ``` cpp
+template <class Alloc> queue(queue&& q, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(q.c)` as the first argument
 and `a` as the second argument.
 #### `queue` operators <a id="queue.ops">[[queue.ops]]</a>
 ``` cpp
 template <class T, class Container>
+ bool operator==(const queue<T, Container>& x, const queue<T, Container>& y);
 ```
 *Returns:* `x.c == y.c`.
 ``` cpp
 template <class T, class Container>
+ bool operator!=(const queue<T, Container>& x,  const queue<T, Container>& y);
 ```
 *Returns:* `x.c != y.c`.
 ``` cpp
 template <class T, class Container>
+ bool operator< (const queue<T, Container>& x, const queue<T, Container>& y);
 ```
 *Returns:* `x.c < y.c`.
 ``` cpp
 template <class T, class Container>
+ bool operator<=(const queue<T, Container>& x, const queue<T, Container>& y);
 ```
 *Returns:* `x.c <= y.c`.
 ``` cpp
 template <class T, class Container>
+ bool operator> (const queue<T, Container>& x, const queue<T, Container>& y);
 ```
 *Returns:* `x.c > y.c`.
 ``` cpp
 ``` cpp
 template <class T, class Container>
   void swap(queue<T, Container>& x, queue<T, Container>& y) noexcept(noexcept(x.swap(y)));
 ```
+*Remarks:* This function shall not participate in overload resolution
+unless `is_swappable_v<Container>` is `true`.
+*Effects:* As if by `x.swap(y)`.
 ### Class template `priority_queue` <a id="priority.queue">[[priority.queue]]</a>
 Any sequence container with random access iterator and supporting
 operations `front()`, `push_back()` and `pop_back()` can be used to
 namespace std {
   template <class T, class Container = vector<T>,
     class Compare = less<typename Container::value_type>>
   class priority_queue {
   public:
+ using value_type      = typename Container::value_type;
+ using reference       = typename Container::reference;
+ using const_reference = typename Container::const_reference;
+ using size_type       = typename Container::size_type;
+ using container_type  = Container;
+    using value_compare   = Compare;
   protected:
     Container c;
     Compare comp;
   public:
     template <class InputIterator>
       priority_queue(InputIterator first, InputIterator last,
              const Compare& x = Compare(), Container&& = Container());
     template <class Alloc> explicit priority_queue(const Alloc&);
     template <class Alloc> priority_queue(const Compare&, const Alloc&);
+    template <class Alloc> priority_queue(const Compare&, const Container&, const Alloc&);
+    template <class Alloc> priority_queue(const Compare&, Container&&, const Alloc&);
     template <class Alloc> priority_queue(const priority_queue&, const Alloc&);
     template <class Alloc> priority_queue(priority_queue&&, const Alloc&);
     bool      empty() const       { return c.empty(); }
     size_type size()  const       { return c.size(); }
     const_reference   top() const { return c.front(); }
     void push(const value_type& x);
     void push(value_type&& x);
     template <class... Args> void emplace(Args&&... args);
     void pop();
+    void swap(priority_queue& q) noexcept(is_nothrow_swappable_v<Container> &&
+                                          is_nothrow_swappable_v<Compare>)
       { using std::swap; swap(c, q.c); swap(comp, q.comp); }
   };
+  template<class Compare, class Container>
+    priority_queue(Compare, Container)
+      -> priority_queue<typename Container::value_type, Container, Compare>;
+  template<class InputIterator,
+           class Compare = less<typename iterator_traits<InputIterator>::value_type>,
+           class Container = vector<typename iterator_traits<InputIterator>::value_type>>
+    priority_queue(InputIterator, InputIterator, Compare = Compare(), Container = Container())
+      -> priority_queue<typename iterator_traits<InputIterator>::value_type, Container, Compare>;
+  template<class Compare, class Container, class Allocator>
+    priority_queue(Compare, Container, Allocator)
+      -> priority_queue<typename Container::value_type, Container, Compare>;
   // no equality is provided
   template <class T, class Container, class Compare>
     void swap(priority_queue<T, Container, Compare>& x,
               priority_queue<T, Container, Compare>& y) noexcept(noexcept(x.swap(y)));
   template <class T, class Container, class Compare, class Alloc>
 ```
 #### `priority_queue` constructors <a id="priqueue.cons">[[priqueue.cons]]</a>
 ``` cpp
+priority_queue(const Compare& x, const Container& y);
+explicit priority_queue(const Compare& x = Compare(), Container&& y = Container());
 ```
 *Requires:* `x` shall define a strict weak ordering ([[alg.sorting]]).
 *Effects:* Initializes `comp` with `x` and `c` with `y` (copy
 `c.insert(c.end(), first, last)`; and finally calls
 `make_heap(c.begin(), c.end(), comp)`.
 #### `priority_queue` constructors with allocators <a id="priqueue.cons.alloc">[[priqueue.cons.alloc]]</a>
+If `uses_allocator_v<container_type, Alloc>` is `false` the constructors
+in this subclause shall not participate in overload resolution.
 ``` cpp
+template <class Alloc> explicit priority_queue(const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `a` and value-initializes `comp`.
 ``` cpp
+template <class Alloc> priority_queue(const Compare& compare, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `a` and initializes `comp` with
 `compare`.
 template <class Alloc>
   priority_queue(const Compare& compare, const Container& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `cont` as the first argument and `a` as
+the second argument, and initializes `comp` with `compare`; calls
+`make_heap(c.begin(), c.end(), comp)`.
 ``` cpp
 template <class Alloc>
   priority_queue(const Compare& compare, Container&& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(cont)` as the first argument
+and `a` as the second argument, and initializes `comp` with `compare`;
+calls `make_heap(c.begin(), c.end(), comp)`.
 ``` cpp
+template <class Alloc> priority_queue(const priority_queue& q, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `q.c` as the first argument and `a` as
 the second argument, and initializes `comp` with `q.comp`.
 ``` cpp
+template <class Alloc> priority_queue(priority_queue&& q, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(q.c)` as the first argument
 and `a` as the second argument, and initializes `comp` with
 `std::move(q.comp)`.
 ``` cpp
 void push(const value_type& x);
 ```
+*Effects:* As if by:
 ``` cpp
 c.push_back(x);
 push_heap(c.begin(), c.end(), comp);
 ```
 ``` cpp
 void push(value_type&& x);
 ```
+*Effects:* As if by:
 ``` cpp
 c.push_back(std::move(x));
 push_heap(c.begin(), c.end(), comp);
 ```
 ``` cpp
 template <class... Args> void emplace(Args&&... args)
 ```
+*Effects:* As if by:
 ``` cpp
 c.emplace_back(std::forward<Args>(args)...);
 push_heap(c.begin(), c.end(), comp);
 ```
 ``` cpp
 void pop();
 ```
+*Effects:* As if by:
 ``` cpp
 pop_heap(c.begin(), c.end(), comp);
 c.pop_back();
 ```
 #### `priority_queue` specialized algorithms <a id="priqueue.special">[[priqueue.special]]</a>
 ``` cpp
+template <class T, class Container, class Compare>
   void swap(priority_queue<T, Container, Compare>& x,
             priority_queue<T, Container, Compare>& y) noexcept(noexcept(x.swap(y)));
 ```
+*Remarks:* This function shall not participate in overload resolution
+unless `is_swappable_v<Container>` is `true` and
+`is_swappable_v<Compare>` is `true`.
+*Effects:* As if by `x.swap(y)`.
 ### Class template `stack` <a id="stack">[[stack]]</a>
 Any sequence container supporting operations `back()`, `push_back()` and
 `pop_back()` can be used to instantiate `stack`. In particular,
 `vector` ([[vector]]), `list` ([[list]]) and `deque` ([[deque]]) can
 be used.
 #### `stack` definition <a id="stack.defn">[[stack.defn]]</a>
 ``` cpp
 namespace std {
   template <class T, class Container = deque<T>>
   class stack {
   public:
+ using value_type      = typename Container::value_type;
+ using reference       = typename Container::reference;
+ using const_reference = typename Container::const_reference;
+ using size_type       = typename Container::size_type;
+ using container_type  = Container;
   protected:
     Container c;
   public:
     explicit stack(const Container&);
     size_type size()  const             { return c.size(); }
     reference         top()             { return c.back(); }
     const_reference   top() const       { return c.back(); }
     void push(const value_type& x)      { c.push_back(x); }
     void push(value_type&& x)           { c.push_back(std::move(x)); }
+    template <class... Args>
+ reference emplace(Args&&... args) { return c.emplace_back(std::forward<Args>(args)...); }
     void pop()                          { c.pop_back(); }
+    void swap(stack& s) noexcept(is_nothrow_swappable_v<Container>)
       { using std::swap; swap(c, s.c); }
   };
+  template<class Container>
+    stack(Container) -> stack<typename Container::value_type, Container>;
+  template<class Container, class Allocator>
+    stack(Container, Allocator) -> stack<typename Container::value_type, Container>;
   template <class T, class Container>
     bool operator==(const stack<T, Container>& x, const stack<T, Container>& y);
   template <class T, class Container>
     bool operator< (const stack<T, Container>& x, const stack<T, Container>& y);
   template <class T, class Container>
 *Effects:* Initializes `c` with `std::move(cont)`.
 #### `stack` constructors with allocators <a id="stack.cons.alloc">[[stack.cons.alloc]]</a>
+If `uses_allocator_v<container_type, Alloc>` is `false` the constructors
+in this subclause shall not participate in overload resolution.
 ``` cpp
+template <class Alloc> explicit stack(const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `a`.
 ``` cpp
+template <class Alloc> stack(const container_type& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `cont` as the first argument and `a` as
 the second argument.
 ``` cpp
+template <class Alloc> stack(container_type&& cont, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(cont)` as the first argument
 and `a` as the second argument.
 ``` cpp
+template <class Alloc> stack(const stack& s, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `s.c` as the first argument and `a` as
 the second argument.
 ``` cpp
+template <class Alloc> stack(stack&& s, const Alloc& a);
 ```
 *Effects:*  Initializes `c` with `std::move(s.c)` as the first argument
 and `a` as the second argument.
 #### `stack` operators <a id="stack.ops">[[stack.ops]]</a>
 ``` cpp
 template <class T, class Container>
+ bool operator==(const stack<T, Container>& x, const stack<T, Container>& y);
 ```
 *Returns:* `x.c == y.c`.
 ``` cpp
 template <class T, class Container>
+ bool operator!=(const stack<T, Container>& x, const stack<T, Container>& y);
 ```
 *Returns:* `x.c != y.c`.
 ``` cpp
 template <class T, class Container>
+ bool operator< (const stack<T, Container>& x, const stack<T, Container>& y);
 ```
 *Returns:* `x.c < y.c`.
 ``` cpp
 template <class T, class Container>
+ bool operator<=(const stack<T, Container>& x, const stack<T, Container>& y);
 ```
 *Returns:* `x.c <= y.c`.
 ``` cpp
 template <class T, class Container>
+ bool operator> (const stack<T, Container>& x, const stack<T, Container>& y);
 ```
 *Returns:* `x.c > y.c`.
 ``` cpp
 template <class T, class Container>
+    bool operator>=(const stack<T, Container>& x, const stack<T, Container>& y);
 ```
 *Returns:* `x.c >= y.c`.
 #### `stack` specialized algorithms <a id="stack.special">[[stack.special]]</a>
 ``` cpp
 template <class T, class Container>
   void swap(stack<T, Container>& x, stack<T, Container>& y) noexcept(noexcept(x.swap(y)));
 ```
+*Remarks:* This function shall not participate in overload resolution
+unless `is_swappable_v<Container>` is `true`.
+*Effects:* As if by `x.swap(y)`.
 <!-- Link reference definitions -->
 [alg.sorting]: algorithms.md#alg.sorting
 [algorithm.stable]: library.md#algorithm.stable
 [algorithms]: algorithms.md#algorithms
 [allocator.requirements]: library.md#allocator.requirements
+[allocator.requirements.completeness]: library.md#allocator.requirements.completeness
 [allocator.traits.members]: utilities.md#allocator.traits.members
 [array]: #array
 [array.cons]: #array.cons
 [array.data]: #array.data
 [array.fill]: #array.fill
 [array.overview]: #array.overview
 [array.size]: #array.size
 [array.special]: #array.special
 [array.swap]: #array.swap
+[array.syn]: #array.syn
 [array.tuple]: #array.tuple
 [array.zero]: #array.zero
 [associative]: #associative
 [associative.general]: #associative.general
 [associative.map.syn]: #associative.map.syn
 [class.copy]: special.md#class.copy
 [class.ctor]: special.md#class.ctor
 [class.dtor]: special.md#class.dtor
 [container.adaptors]: #container.adaptors
 [container.adaptors.general]: #container.adaptors.general
+[container.insert.return]: #container.insert.return
+[container.node]: #container.node
+[container.node.cons]: #container.node.cons
+[container.node.dtor]: #container.node.dtor
+[container.node.modifiers]: #container.node.modifiers
+[container.node.observers]: #container.node.observers
+[container.node.overview]: #container.node.overview
 [container.requirements]: #container.requirements
 [container.requirements.dataraces]: #container.requirements.dataraces
 [container.requirements.general]: #container.requirements.general
 [containers]: #containers
 [containers.general]: #containers.general
 [deque.capacity]: #deque.capacity
 [deque.cons]: #deque.cons
 [deque.modifiers]: #deque.modifiers
 [deque.overview]: #deque.overview
 [deque.special]: #deque.special
+[deque.syn]: #deque.syn
 [forward.iterators]: iterators.md#forward.iterators
+[forward_list.syn]: #forward_list.syn
 [forwardlist]: #forwardlist
 [forwardlist.access]: #forwardlist.access
 [forwardlist.cons]: #forwardlist.cons
 [forwardlist.iter]: #forwardlist.iter
 [forwardlist.modifiers]: #forwardlist.modifiers
 [forwardlist.ops]: #forwardlist.ops
 [forwardlist.overview]: #forwardlist.overview
 [forwardlist.spec]: #forwardlist.spec
 [hash.requirements]: library.md#hash.requirements
 [iterator.requirements]: iterators.md#iterator.requirements
+[iterator.requirements.general]: iterators.md#iterator.requirements.general
 [list]: #list
 [list.capacity]: #list.capacity
 [list.cons]: #list.cons
 [list.modifiers]: #list.modifiers
 [list.ops]: #list.ops
 [list.overview]: #list.overview
 [list.special]: #list.special
+[list.syn]: #list.syn
 [map]: #map
 [map.access]: #map.access
 [map.cons]: #map.cons
 [map.modifiers]: #map.modifiers
 [map.overview]: #map.overview
 [queue.cons.alloc]: #queue.cons.alloc
 [queue.defn]: #queue.defn
 [queue.ops]: #queue.ops
 [queue.special]: #queue.special
 [queue.syn]: #queue.syn
+[random.access.iterators]: iterators.md#random.access.iterators
 [res.on.data.races]: library.md#res.on.data.races
 [sequence.reqmts]: #sequence.reqmts
 [sequences]: #sequences
 [sequences.general]: #sequences.general
 [set]: #set
 [stack.defn]: #stack.defn
 [stack.ops]: #stack.ops
 [stack.special]: #stack.special
 [stack.syn]: #stack.syn
 [strings]: strings.md#strings
+[swappable.requirements]: library.md#swappable.requirements
 [tab:HashRequirements]: #tab:HashRequirements
 [tab:containers.allocatoraware]: #tab:containers.allocatoraware
 [tab:containers.associative.requirements]: #tab:containers.associative.requirements
 [tab:containers.container.requirements]: #tab:containers.container.requirements
 [tab:containers.lib.summary]: #tab:containers.lib.summary
+[tab:containers.node.compat]: #tab:containers.node.compat
 [tab:containers.optional.operations]: #tab:containers.optional.operations
 [tab:containers.reversible.requirements]: #tab:containers.reversible.requirements
 [tab:containers.sequence.optional]: #tab:containers.sequence.optional
 [tab:containers.sequence.requirements]: #tab:containers.sequence.requirements
 [temp.deduct]: temp.md#temp.deduct
 [vector.cons]: #vector.cons
 [vector.data]: #vector.data
 [vector.modifiers]: #vector.modifiers
 [vector.overview]: #vector.overview
 [vector.special]: #vector.special
+[vector.syn]: #vector.syn
 [^1]: Equality comparison is a refinement of partitioning if no two
     objects that compare equal fall into different partitions.
 [^2]: These member functions are only provided by containers whose

Diff to HTML by rtfpessoa