Doesn't break stack traces in general,
and fixes the reported behavior.
We may be missing some other corner cases,
but we'll have to handle those as we come to them.