Yeah, let's prefer a slightly stronger type representing this.
According to my comparative measurement, the whole change stack did not introduce any space and time overhead to the baseline. No reports changed. No crashes were introduced.
I tested about 12 projects or so.
The comment above is off now as that should go for CDF_MaybeBuiltin.