diff -ru php4.orig/xapian_wrap.cc php4/xapian_wrap.cc
--- php4.orig/xapian_wrap.cc	2007-09-29 01:12:30.000000000 +0100
+++ php4/xapian_wrap.cc	2007-10-10 15:53:23.000000000 +0100
@@ -1794,23 +1794,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__PositionIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPositionIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -1856,23 +1846,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__PositionIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPositionIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -2248,23 +2228,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__PostingIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPostingIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -2345,23 +2315,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__PostingIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPostingIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -2571,17 +2531,14 @@
     Xapian::PositionIterator * resultobj = new Xapian::PositionIterator((Xapian::PositionIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__PositionIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPositionIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianPositionIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -2628,17 +2585,14 @@
     Xapian::PositionIterator * resultobj = new Xapian::PositionIterator((Xapian::PositionIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__PositionIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPositionIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianPositionIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -2904,23 +2858,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -2966,23 +2910,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -3230,9 +3164,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -3366,17 +3298,14 @@
     Xapian::PositionIterator * resultobj = new Xapian::PositionIterator((Xapian::PositionIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__PositionIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPositionIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianPositionIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -3423,17 +3352,14 @@
     Xapian::PositionIterator * resultobj = new Xapian::PositionIterator((Xapian::PositionIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__PositionIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPositionIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianPositionIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -3563,23 +3489,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__ValueIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianValueIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -3625,23 +3541,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__ValueIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianValueIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -4019,23 +3925,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Document, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDocument);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -4074,23 +3970,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Document, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDocument);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -4261,9 +4147,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4447,9 +4331,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4513,9 +4395,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4572,9 +4452,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4685,9 +4563,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4737,9 +4613,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4851,9 +4725,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4910,9 +4782,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -5016,9 +4886,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -5149,17 +5017,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -5206,17 +5071,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -5307,17 +5169,14 @@
     Xapian::ValueIterator * resultobj = new Xapian::ValueIterator((Xapian::ValueIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__ValueIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianValueIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianValueIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -5364,17 +5223,14 @@
     Xapian::ValueIterator * resultobj = new Xapian::ValueIterator((Xapian::ValueIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__ValueIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianValueIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianValueIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -5548,23 +5404,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__MSet, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -5610,23 +5456,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__MSet, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -6539,17 +6375,14 @@
     Xapian::MSetIterator * resultobj = new Xapian::MSetIterator((Xapian::MSetIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__MSetIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianMSetIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -6596,17 +6429,14 @@
     Xapian::MSetIterator * resultobj = new Xapian::MSetIterator((Xapian::MSetIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__MSetIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianMSetIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -6653,17 +6483,14 @@
     Xapian::MSetIterator * resultobj = new Xapian::MSetIterator((Xapian::MSetIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__MSetIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianMSetIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -6718,17 +6545,14 @@
     Xapian::MSetIterator * resultobj = new Xapian::MSetIterator((Xapian::MSetIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__MSetIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianMSetIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -6835,17 +6659,14 @@
     Xapian::Document * resultobj = new Xapian::Document((Xapian::Document &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Document, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDocument);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianDocument);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -7079,23 +6900,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__MSetIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -7141,23 +6952,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__MSetIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -7442,17 +7243,14 @@
     Xapian::Document * resultobj = new Xapian::Document((Xapian::Document &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Document, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDocument);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianDocument);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -7802,23 +7600,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__ESet, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -7864,23 +7652,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__ESet, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -8120,17 +7898,14 @@
     Xapian::ESetIterator * resultobj = new Xapian::ESetIterator((Xapian::ESetIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__ESetIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianESetIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -8177,17 +7952,14 @@
     Xapian::ESetIterator * resultobj = new Xapian::ESetIterator((Xapian::ESetIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__ESetIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianESetIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -8234,17 +8006,14 @@
     Xapian::ESetIterator * resultobj = new Xapian::ESetIterator((Xapian::ESetIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__ESetIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianESetIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -8374,23 +8143,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__ESetIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -8436,23 +8195,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__ESetIterator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESetIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -8915,23 +8664,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__RSet, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianRSet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -8970,23 +8709,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__RSet, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianRSet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -9842,23 +9571,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Enquire, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianEnquire);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -10095,17 +9814,14 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 0);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianQuery);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -10969,17 +10685,14 @@
     Xapian::MSet * resultobj = new Xapian::MSet((Xapian::MSet &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__MSet, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianMSet);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11048,17 +10761,14 @@
     Xapian::MSet * resultobj = new Xapian::MSet((Xapian::MSet &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__MSet, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianMSet);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11120,17 +10830,14 @@
     Xapian::MSet * resultobj = new Xapian::MSet((Xapian::MSet &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__MSet, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianMSet);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11198,17 +10905,14 @@
     Xapian::MSet * resultobj = new Xapian::MSet((Xapian::MSet &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__MSet, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianMSet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianMSet);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11380,17 +11084,14 @@
     Xapian::ESet * resultobj = new Xapian::ESet((Xapian::ESet &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__ESet, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianESet);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11458,17 +11159,14 @@
     Xapian::ESet * resultobj = new Xapian::ESet((Xapian::ESet &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__ESet, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianESet);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11529,17 +11227,14 @@
     Xapian::ESet * resultobj = new Xapian::ESet((Xapian::ESet &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__ESet, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianESet);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianESet);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11675,17 +11370,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11740,17 +11432,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11804,17 +11493,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -11912,17 +11598,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -12301,21 +11984,16 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Weight, 0);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWeight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWeight);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -12658,17 +12336,14 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BoolWeight, 0);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianBoolWeight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianBoolWeight);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -12707,23 +12382,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BoolWeight, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianBoolWeight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -12900,21 +12565,16 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BoolWeight, 0);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianBoolWeight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianBoolWeight);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13276,23 +12936,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BM25Weight, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianBM25Weight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -13331,23 +12981,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BM25Weight, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianBM25Weight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -13428,17 +13068,14 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BM25Weight, 0);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianBM25Weight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianBM25Weight);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -13615,21 +13252,16 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BM25Weight, 0);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianBM25Weight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianBM25Weight);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13963,23 +13595,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TradWeight, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTradWeight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -14018,23 +13640,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TradWeight, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTradWeight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -14103,17 +13715,14 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TradWeight, 0);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTradWeight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTradWeight);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -14290,21 +13899,16 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TradWeight, 0);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTradWeight);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianTradWeight);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14678,23 +14282,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -14741,27 +14335,15 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14841,23 +14423,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -15032,21 +14604,16 @@
     Xapian::PostingIterator * resultobj = new Xapian::PostingIterator((Xapian::PostingIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__PostingIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPostingIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianPostingIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15100,21 +14667,16 @@
     Xapian::PostingIterator * resultobj = new Xapian::PostingIterator((Xapian::PostingIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__PostingIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPostingIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianPostingIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15168,17 +14730,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -15233,17 +14792,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -15305,21 +14861,16 @@
     Xapian::PositionIterator * resultobj = new Xapian::PositionIterator((Xapian::PositionIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__PositionIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPositionIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg3->data()), arg3->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianPositionIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15380,21 +14931,16 @@
     Xapian::PositionIterator * resultobj = new Xapian::PositionIterator((Xapian::PositionIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__PositionIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianPositionIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg3->data()), arg3->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianPositionIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15440,17 +14986,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -15497,17 +15040,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -15562,21 +15102,16 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15670,21 +15205,16 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15909,9 +15439,7 @@
   {
     ZVAL_LONG(return_value,result);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15964,9 +15492,7 @@
   {
     ZVAL_BOOL(return_value,(result)?1:0);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16019,9 +15545,7 @@
   {
     ZVAL_LONG(return_value,result);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16168,17 +15692,14 @@
     Xapian::Document * resultobj = new Xapian::Document((Xapian::Document &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Document, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDocument);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianDocument);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -16239,9 +15760,7 @@
   {
     ZVAL_STRINGL(return_value, const_cast<char*>((&result)->data()), (&result)->size(), 1);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16294,9 +15813,7 @@
   {
     ZVAL_STRINGL(return_value, const_cast<char*>((&result)->data()), (&result)->size(), 1);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16390,17 +15907,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -16447,17 +15961,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -16512,21 +16023,16 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16580,21 +16086,16 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16648,21 +16149,16 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16708,17 +16204,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -16813,21 +16306,16 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16873,17 +16361,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -16977,9 +16462,7 @@
   {
     ZVAL_STRINGL(return_value, const_cast<char*>((&result)->data()), (&result)->size(), 1);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17099,23 +16582,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -17169,27 +16642,15 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17234,23 +16695,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -17747,9 +17198,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17851,9 +17300,7 @@
   {
     ZVAL_LONG(return_value,result);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17965,9 +17412,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18017,9 +17462,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18124,9 +17567,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18176,9 +17617,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18283,12 +17722,8 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18345,12 +17780,8 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18400,9 +17831,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18459,12 +17888,8 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18599,21 +18024,16 @@
     Xapian::Database * resultobj = new Xapian::Database((Xapian::Database &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18659,21 +18079,16 @@
     Xapian::Database * resultobj = new Xapian::Database((Xapian::Database &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18733,21 +18148,16 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18800,21 +18210,16 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18909,21 +18314,16 @@
     Xapian::Database * resultobj = new Xapian::Database((Xapian::Database &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18983,21 +18383,16 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19050,21 +18445,16 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19151,17 +18541,14 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -19229,21 +18616,16 @@
     Xapian::Database * resultobj = new Xapian::Database((Xapian::Database &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19303,21 +18685,16 @@
     Xapian::Database * resultobj = new Xapian::Database((Xapian::Database &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19370,21 +18747,16 @@
     Xapian::Database * resultobj = new Xapian::Database((Xapian::Database &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19451,21 +18823,16 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19525,21 +18892,16 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19592,21 +18954,16 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19666,24 +19023,17 @@
     Xapian::Database * resultobj = new Xapian::Database((Xapian::Database &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19736,24 +19086,17 @@
     Xapian::Database * resultobj = new Xapian::Database((Xapian::Database &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Database, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19902,24 +19245,17 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19972,24 +19308,17 @@
     Xapian::WritableDatabase * resultobj = new Xapian::WritableDatabase((Xapian::WritableDatabase &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__WritableDatabase, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianWritableDatabase);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianWritableDatabase);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20138,27 +19467,15 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20211,27 +19528,15 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20277,27 +19582,15 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20355,23 +19648,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -20432,30 +19715,16 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[2]), const_cast<char*>(arg3->data()), arg3->size(), 1);
   }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20500,23 +19769,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -20584,30 +19843,16 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[2]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[3]), const_cast<char*>(arg4->data()), arg4->size(), 1);
   }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20693,23 +19938,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -20789,23 +20024,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -20860,23 +20085,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -20915,23 +20130,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -21219,17 +20424,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -21276,17 +20478,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -21475,9 +20674,7 @@
   {
     ZVAL_BOOL(return_value,(result)?1:0);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -21649,23 +20846,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__SimpleStopper, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianSimpleStopper);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -21716,9 +20903,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -21771,9 +20956,7 @@
   {
     ZVAL_BOOL(return_value,(result)?1:0);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -22098,23 +21281,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__StringValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianStringValueRangeProcessor);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -22320,23 +21493,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__DateValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDateValueRangeProcessor);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -22390,23 +21553,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__DateValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDateValueRangeProcessor);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -22453,23 +21606,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__DateValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDateValueRangeProcessor);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -22708,23 +21851,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__v102__NumberValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_NumberValueRangeProcessor);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -22785,27 +21918,15 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__v102__NumberValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_NumberValueRangeProcessor);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -22858,27 +21979,15 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__v102__NumberValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_NumberValueRangeProcessor);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23110,23 +22219,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__QueryParser, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQueryParser);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -23598,24 +22697,17 @@
     Xapian::Query * resultobj = new Xapian::Query((Xapian::Query &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[2]), const_cast<char*>(arg4->data()), arg4->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianQuery);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23676,21 +22768,16 @@
     Xapian::Query * resultobj = new Xapian::Query((Xapian::Query &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianQuery);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23744,21 +22831,16 @@
     Xapian::Query * resultobj = new Xapian::Query((Xapian::Query &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__Query, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianQuery);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianQuery);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23886,12 +22968,8 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23948,12 +23026,8 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23999,17 +23073,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -24056,17 +23127,14 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -24121,21 +23189,16 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -24189,21 +23252,16 @@
     Xapian::TermIterator * resultobj = new Xapian::TermIterator((Xapian::TermIterator &) result);
     SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_Xapian__TermIterator, 1);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermIterator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
+    object_init_ex(return_value,ptr_ce_swig_XapianTermIterator);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -24475,9 +23533,7 @@
   {
     ZVAL_DOUBLE(return_value,result);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -24523,27 +23579,15 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Stem, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianStem);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
   }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -24631,9 +23675,7 @@
   {
     ZVAL_STRINGL(return_value, const_cast<char*>((&result)->data()), (&result)->size(), 1);
   }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -24798,23 +23840,13 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TermGenerator, 1);
   }
-  /* Wrap this return value */
-  if (this_ptr) {
-    /* NATIVE Constructor, use this_ptr */
-    zval *_cPtr; MAKE_STD_ZVAL(_cPtr);
+  {
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
     add_property_zval(this_ptr,"_cPtr",_cPtr);
-  } else if (! this_ptr) {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianTermGenerator);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
   }
   return;
 fail:
@@ -25124,17 +24156,14 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Document, 0);
   }
-  /* Wrap this return value */
   {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
+    /* Wrap this return value */
+    zval *_cPtr;
+    ALLOC_ZVAL(_cPtr);
     *_cPtr = *return_value;
     INIT_ZVAL(*return_value);
-    object_init_ex(obj,ptr_ce_swig_XapianDocument);
-    add_property_zval(obj,"_cPtr",_cPtr);
-    *return_value=*obj;
+    object_init_ex(return_value,ptr_ce_swig_XapianDocument);
+    add_property_zval(return_value,"_cPtr",_cPtr);
   }
   return;
 fail:
@@ -25402,12 +24431,8 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[2]), const_cast<char*>(arg4->data()), arg4->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -25464,9 +24489,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -25516,9 +24539,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -25653,12 +24674,8 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[2]), const_cast<char*>(arg4->data()), arg4->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -25715,9 +24732,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -25767,9 +24782,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
