Apply patch from #2978: add more Unicode syntax