Apply LWG2371 from N4079.
Apply LWG2374 from N4079.