Checkpoint while shuffling family values.
Added locally scoped lambdas.
Self-review