I suggest that IF it is decided to "improve" a drinking fountain by requiring a GFI, that the change be made in the UL standard, and not the NEC. Let UL require manufacturers to incorporate such a device in the product, with accessable re-set/trip buttons. If they're affordable for $10 hair dryers, they ought to be affordable for $300 water fountains.
Also, the new GFI standards are claimed to reduce the problems caused by nuisance tripping- especially a concern with refrigeration compressors!