Don't cache locals in envvar when calling to_proc
Merge branch 'no_locals_for_to_proc' into 2.1