[tz] [PROPOSED 2/2] Port to C23 strchr macro