re #91: Fix PHP 5.2 errors