The first of thse two patches is an uncorrupted version of the patch in the parent message. The second is a few suggested changes. Overall, it looks very good. If you're okay with these changes, and at least one other person ACKs the combination, I can squash the two patches together and push the result.