Perl cleanup for 5.18