You're right. I've fixed this kind of stuff now in the latest commit in this PR.