Changes to improve compatibility with Perl 5.8.