There is another PR in progress for this issue, #2000. Progress on that has stalled recently, but that PR still gets priority on this issue since it's been worked on already. So I'm going to close this PR for now.

But thanks for working this up! I'm always impressed when someone new steps into the C code, since it's a difficult thing to get set up with developing.

If you're looking for an issue to tackle, #2050 and #2084 opened by me are both pretty actionable, in my opinion.