Remove cruft from stats filter.  Fix tests.