[P0896R4](http://wg21.link/p0896r4) Edits to Clause 17. To be applied to motions-2018-11-lwg-25 branch.