mostly reverted with this edit: https://www.openstreetmap.org/changeset/170833960
No need to invent some non-existent canals, to relocate some nodes or no create some unspecified crossings of roads and fences just to resolve some warnings!