Yes, that's true, should be fixed that way. Might be a few more of those, they are very old code. If you fix it in this pull request, please be sure to put it in a separate commit (for bisection purposes).