[P3310R0](https://wg21.link/p3310r0) Solving partial ordering issues introduced by P0522R0 (Matheus Izvekov)