GH #1758: Don't clobber self while setting up block for evals.

* Related: see commit 901b47a664f31cfd96ccd938c68f188d01397495
* Added a spec to prevent regressions.