Fix to previous Unicode change.  (Rebase this.)