Make parser in restore.pl more tolerant, and reorder descriptor fields.