Fixed some more int/long types in Count.
work-in-progress for fmeasure