More clean up for Unicode corrigendum #9