Cleanup in preparation for PECL submission.