unicode: minor reordering