That’s been fixed now. Initially I wasn’t including waterway=canal. But I kept seeing issues like that. So now I include a waterway=canal iff there is lock=yes. Water will now flow through locks.
I made this code change yesterday, and posted this message before that code change. This also fixed one of the erorrs I mention in my original post. Ooops.