Revert a change.
Make dataType for each of CountDistinct, ApproxCountDistinctMerge and ApproxCountDistinct LongType.
Remove a superfluous line.