Two easy DRs to implement. We even had the tests half written.

Tested x86_64-linux and powerpc64l2-linux, committed to trunk.

I'll probably backport this in a week or two.