Add binary_function to aggregator
Make const usage consistent in aggregator