Even though GCC 16 isn't due until April, just filing this as a reminder to test whether those two patches are still necessary when updating. Before I forget about it.
Supposedly, the issues were fixed upstream by these two commits:
https://gcc.gnu.org/cgit/gcc/commit/?id=dea7b9a78b11b5ca0c85b971521144ba07a66aca
https://gcc.gnu.org/cgit/gcc/commit/?id=ee7c0a5b70dc316477f45abc0f09dd2af9abe5cb