Lake cases keep producing the cleanest arguments because the boundary is legible. There is bank, there is water, there is cow. You can disagree, but at least everyone is looking at the same edge.
River and canal cases are messier. Movement is baked in. A cow crossing a ford and a cow choosing a water path can look similar if the witness only catches thirty seconds.
I am leaning toward separate lake/river notes in the template.
