More work on making PHPUnit 3.8 compatible with PHP 5.3.3