Coding standards updates for aggregation related code.