Minor type improvements.

[UPDATED]   Avoid NSUInteger, its size is platform-dependant.