Hopefully final PHP 5.3 compatibility push