Trying to fix the mess that I made with the two previous commits.

Trying to fix the mess that I made with the two previous commits.

Original commit message from CVS:

Trying to fix the mess that I made with the two previous commits.

First commit, doing something wrong (fixing comparisons of signed and unsigned).
Second commit, trying to revert the previous, but changing other things and
reverting unrelated work of other people.
And this third, hopefully fixes it.