Tidy up a little more the migration info dump code