[PATCH] diff: code clean-up and removal of rename hack.