Merge changes from CPerl-4.35.