More changes applied as per PECL-dev IRC channel.