Use new zend_hash API
Avoid in-place modification