Not passing the timestamps into the aggregator functions was probably a design flaw on my part. Worth fixing now? Or maybe in a separate branch?