Fix #2306: Aggregate cursor usage