Reject this one. I tried out the changes on my local machine (in a different source tree). I have fixed this and want to issue another pull request. I don't think I can unless you reject this one.