Handle a few more cases here.
Handle corner-case around `rescue`.