Remove hash lookup during preaggregation