Make NetBSD (and the Perl community) happier.
Merge.