Tidied unicode handling