Another try at getting PHPUnit happy.