This amends commit 7bd9efc7.

Using the more explicit typedef causes gcc to warn about the
incompatible types for the reasons noted in the earlier commit
message.  This is why we just used the unsigned type earlier so we
could avoid all this casting.

The things we do to make Windows happy...