I'm wondering about the locker rental changes, too. We would certainly stop using them if they were no longer day-use. That wouldn't work with the way we use the lockers at all. We stop by in the morning and get a locker for a few snacks and maybe toss jackets in there. Then, throughout the day, anyone can stop by and grab a snack or pick up (or drop off) their jacket. I've got older kids that can visit on their own, so i works out nicely that we can all access the locker without having to be together, and that it can be accessed throughout the day.
Anyways. As for whatever, I'm totally a water drinker as well and I'm just fine w/the free water. I always ask for a 'large water' and almost always have receive water in the soda size cup. Works out nicely, and I don't have to carry around a water bottle (we don't even carry a backpack, since we go the locker route for the random stuff).