Add a bunch more stats (for single-record mode)
Clean up batch vs. single code path.