Massively simplified waterml module. Lots of cruft removed.
* Some finer-grain refactoring remains.