Fix unicode identifiers handling