> Maybe call it `czm_getWaterNoise` and mark it @private. This avoids the code duplication, but doesn't commit to it publicly. The full shader system will, of course, make this cleaner...one day.

Done.  By the way, the comment is still there, it's just attached to an oudated diff, just like this one will be.