Fix some ambiguities that were added in the latest draft standard.
Normally, I would wait for these to be voted upon at a committee meeting (November), but the current draft standard is broken, and this should fix it. (And if it doesn't, we want to know about it soonest)
The discussion for LWG 2758 gives a replace test case for this condition. Could you add that test to our suite?