Reasoning about river basins: WaWO+ revisited. (March 2017)