I have another open PR with the whole `call_site` nil thing ;) I think we'd solved it for 3.x in support but not backported.