Fix fast checkpoints

#954 introduced test/format failures that were not detected before the merge.  Fix them here.