Merge "Improve stack overflow diagnostics (take 2)."