Sync with latest StanAngeloff/php.vim changes.