More Unicode nit-picking