Refactor diff1 records to properly weigh non-diff1 work
Rename *nonces variables to *_diff1 to reflect their nature better