More work on trying to fix PEAR.