1. The water thing is a bit silly. At the end of the day, some vendor is selling the same amount of water. Whether that is to a consumer at the terminal or to a carrier for onboard service. It is also a miniscule piece of the revenue pie and hardly worth the massive antitrust investigation this would lead to if true.
2. Organization of checkpoints will continue to morph. TSA has a stated goal of migrating 85% of passengers to pre-check or at least pre-check type screening by the end of 2015. This means an ever-changing checkpoint arrangement. People on FT kvetched that too many people were in the single pre-check line, now complain that the number of lines expands and contracts.
As an example, at DEN, the CLEAR and Pre-check queues both feed to the same screening points. It's a tossup as to which one is faster and likely designed to show that the $85 for pre-check is a good deal.