[AggregateTarget] Minor cleanup