Adapt checksizes after the improvements to the optimizer.
Merge pull request #845 from sjrd/update-checksizes

Adapt checksizes after the improvements to the optimizer.