[master/12] Fix whyrun_safe_ruby_block regression

`whyrun_safe_ruby_block` broke in the 11 changes.

Forward port of #2021
Merge pull request #2022 from jaymzh/12-whyrun

[master/12] Fix whyrun_safe_ruby_block regression