Patch Set 1: Looks good to me, but someone else must approve

(1 inline comment)

...but we should have tests here. The existing test code does not execute this line and many other lines in the rename detector, which is probably the reason why there is a bug.

Faith Based Programming is a fad.