Move some logging. Apply stripping to both aggregation paths.