More review cleanup.

Diskstats filter now uses nested tables with keys rather than multiple arrays.