Checkpoint.
Cleanups and adds performance regression.