This PR resurrects the changes from #8978, #8992, #8973 which were accidentally removed by #8996. Fixes #8962. --------- Co-authored-by: Wojciech Rozowski <wojciech@lean-fro.org>
never_extract