Fixes to keyword arg handling in Aggregator