[perl-Mail-GnuPG/f16: 6/6] Merge cleanup.