More fiddling with Unicode