I was going to send this as a patch sequence with git-send-email, but we
seem to be lacking the necessary Perl modules. :-)