Clean up session07 code re data aggregation. Closes #1.