Minor tidy update and try to debug for PHP 5.3.3.