Some changes made as per PECL-dev.