Oops, there was a thinko in the patch, whereby wide strings would not be
entirely compared.  Here’s an updated one: