And indeed, it looks good. Thanks!

Now I just need to make sure to keep the relevant diffs around; diffing diffs sure can look ugly though.