villagers seems uncapable of getting out of water in a lot of situations, and i tried this with slabs or stairs under the water and it works only like 50% of the times.

merged with #862