A few more items.* metrics, and move uploaded to uploaded.batches.