[Patch] Fix libstdc++/12352 (continued)

[Pétur Runólfsson]

Paolo Carlini wrote:
> Pétur, Gaby, do you agree that it's a further improvement?

Yes, this seems to catch the rest.

Thanks,
Petur