Code review comment for lp:~adiroiban/launchpad/bug-548999

Including variable renames makes it hard to see what your branch actually does. That could have been separated into another branch. Also, the lack of a pre-implementation discussion is generally a deal-breaker, but this is an obvious-enough bug that I'll go ahead and approve it.