More work on checkpointing.