More PHP 5.3 compatibility fixes and tests.