Small refactorings to use the RenameData class more often.