PHP 5.3 cleanup, fixes #360