Re: $SIG{__DIE__} should be localized and cleared at the start of an eval block

I agree with you but an alternative you didn't mention is to start off
your die handler with:

die @_ if $^S;