Add some untested (!) changes to layer1.water.

This is toward adding methods to OrRules.