Checkpoint.
Some more shuffling and shortening.