NLS: update handling of Unicode