Simplify water stuff (and restore transitivity).

This logic is complicated.