and convert pull_agg_clause() into count_agg_clause(), which is a more
efficient way of doing what it's really being used for.