Adjusted IntegerAggregator and StringAggregator to conform to
requirements