further simplifications in Count