I also noticed that you need to "push" against the water in some cases to go into it. Sometimes you can just go straight into it. I can't be the only one.
Yeah, it's not entirely consistent. I may try and do something about that, as long as I'm looking at this stuff. That's some of the most incomprehensible code in the whole program, though, so I'm not expecting to succeed.