Really fix rename-new-file bug.