As mentioned above by bperrybap, That is what was done to address arduino/ArduinoCore-API#25:
As bperrybap also mentioned, this fix only applies to C++/"Arduino Language" code because the overloads are not supported by C:
But it's likely that the amount of code that is both in C and making the problematic assumptions about the types of these identifiers is likely very small.