Resolve Perl 5.16+ conflicts.