Some tweaks for special cases found in Perl5 dist.
failing case