r23467: Next little simplification: In rename_internals it's a bit pointless to