By the way, an... amusing test case for all things related to water and label placement is Lake Mälaren, the lake that Stockholm is separating from the sea, and all its (named!) nooks and crannies: https://www.openstreetmap.org/relation/1433877 . I've had at least 3 different bits of it poking into different corners of the map at times.