Both of these handle LTO better and no longer restrict tests.
Obsoleted by stabilisation of CVE-2021-22918-related updates.