Touch elements in order (no real change).
Combine the not-modified and not-checkpoint code in one place rather than
splitting it over two functions.
Minor simplification of checkpoint_worker error/fast-success handling.