Also avoid an unnecessary pushdown when aggregating over a query that doesn't have aggregate annotations.