Remove PHP 5.4 syntax stuff #13