diff -ru php5.orig/xapian_wrap.cc php5/xapian_wrap.cc
--- php5.orig/xapian_wrap.cc	2007-09-29 01:12:32.000000000 +0100
+++ php5/xapian_wrap.cc	2007-10-10 15:53:23.000000000 +0100
@@ -1625,16 +1625,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -1678,16 +1668,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -2012,16 +1992,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -2100,16 +2070,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -2317,16 +2277,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -2372,16 +2322,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -2597,16 +2537,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -2650,16 +2580,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -2904,9 +2824,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -3040,16 +2958,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -3095,16 +3003,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -3185,16 +3083,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -3238,16 +3126,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -3575,16 +3453,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -3621,16 +3489,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -3798,9 +3656,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[2]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -3982,9 +3838,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4047,9 +3901,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4105,9 +3957,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4215,9 +4065,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4266,9 +4114,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4377,9 +4223,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4435,9 +4279,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4538,9 +4380,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4671,16 +4511,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4726,16 +4556,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4825,16 +4645,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -4880,16 +4690,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -5014,16 +4814,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -5067,16 +4857,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -5978,16 +5758,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -6033,16 +5803,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -6088,16 +5848,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -6150,16 +5900,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -6263,16 +6003,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -6455,16 +6185,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -6508,16 +6228,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -6800,16 +6510,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -7110,16 +6810,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -7163,16 +6853,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -7411,16 +7091,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -7466,16 +7136,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -7521,16 +7181,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -7611,16 +7261,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -7664,16 +7304,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -8086,16 +7716,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__RSet, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -8132,16 +7752,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__RSet, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -8880,16 +8490,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Enquire, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -9121,16 +8721,6 @@
   {
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -9973,16 +9563,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10049,16 +9629,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10118,16 +9688,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10193,16 +9753,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10370,16 +9920,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10445,16 +9985,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10513,16 +10043,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10654,16 +10174,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10716,16 +10226,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10777,16 +10277,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -10880,16 +10370,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -11216,19 +10696,7 @@
   {
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -11514,16 +10982,6 @@
   {
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -11560,16 +11018,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BoolWeight, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -11744,19 +11192,7 @@
   {
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -12070,16 +11506,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BM25Weight, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -12116,16 +11542,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__BM25Weight, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -12205,16 +11621,6 @@
   {
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -12389,19 +11795,7 @@
   {
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -12687,16 +12081,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TradWeight, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -12733,16 +12117,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TradWeight, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -12810,16 +12184,6 @@
   {
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -12994,19 +12358,7 @@
   {
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13331,16 +12683,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13385,19 +12727,7 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13476,16 +12806,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13658,19 +12978,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13723,19 +13031,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13788,16 +13084,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13850,16 +13136,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13919,19 +13195,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[2]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -13991,19 +13255,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[2]), const_cast<char*>(arg3->data()), arg3->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14049,16 +13301,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14104,16 +13346,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14166,19 +13398,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14269,19 +13489,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14503,9 +13711,7 @@
   {
     ZVAL_LONG(return_value,result);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14557,9 +13763,7 @@
   {
     ZVAL_BOOL(return_value,(result)?1:0);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14611,9 +13815,7 @@
   {
     ZVAL_LONG(return_value,result);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14758,16 +13960,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14826,9 +14018,7 @@
   {
     ZVAL_STRINGL(return_value, const_cast<char*>((&result)->data()), (&result)->size(), 1);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14880,9 +14070,7 @@
   {
     ZVAL_STRINGL(return_value, const_cast<char*>((&result)->data()), (&result)->size(), 1);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -14974,16 +14162,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15029,16 +14207,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15091,19 +14259,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15156,19 +14312,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15221,19 +14365,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15279,16 +14411,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15379,19 +14501,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15437,16 +14547,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15536,9 +14636,7 @@
   {
     ZVAL_STRINGL(return_value, const_cast<char*>((&result)->data()), (&result)->size(), 1);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15610,16 +14708,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15671,19 +14759,7 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -15727,16 +14803,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16225,9 +15291,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16326,9 +15390,7 @@
   {
     ZVAL_LONG(return_value,result);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16437,9 +15499,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16488,9 +15548,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16592,9 +15650,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16643,9 +15699,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16747,12 +15801,8 @@
     }
   }
   
-  {
-    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());
@@ -16808,12 +15858,8 @@
     }
   }
   
-  {
-    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());
@@ -16862,9 +15908,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -16920,12 +15964,8 @@
     }
   }
   
-  {
-    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());
@@ -17015,19 +16055,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17073,19 +16101,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17145,19 +16161,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17210,19 +16214,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17317,19 +16309,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17389,19 +16369,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17454,19 +16422,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17553,16 +16509,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17629,19 +16575,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17701,19 +16635,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17766,19 +16688,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17845,19 +16755,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17917,19 +16815,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -17982,19 +16868,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18054,22 +16928,8 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18122,22 +16982,8 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18286,22 +17132,8 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18354,22 +17186,8 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18517,19 +17335,7 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18581,19 +17387,7 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18638,19 +17432,7 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18707,16 +17489,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18775,22 +17547,8 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    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());
@@ -18834,16 +17592,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -18909,22 +17657,8 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    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());
@@ -19009,16 +17743,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19096,16 +17820,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19158,16 +17872,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19204,16 +17908,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, 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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19500,16 +18194,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19555,16 +18239,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19704,9 +18378,7 @@
   {
     ZVAL_BOOL(return_value,(result)?1:0);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19822,16 +18494,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__SimpleStopper, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19880,9 +18542,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -19934,9 +18594,7 @@
   {
     ZVAL_BOOL(return_value,(result)?1:0);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20159,16 +18817,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__StringValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20326,16 +18974,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__DateValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20387,16 +19025,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__DateValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20441,16 +19069,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__DateValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20641,16 +19259,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__v102__NumberValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20709,19 +19317,7 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__v102__NumberValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20773,19 +19369,7 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__v102__NumberValueRangeProcessor, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -20970,16 +19554,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__QueryParser, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -21442,22 +20016,8 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[3]), const_cast<char*>(arg4->data()), arg4->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -21517,19 +20077,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -21582,19 +20130,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -21719,12 +20255,8 @@
     }
   }
   
-  {
-    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());
@@ -21780,12 +20312,8 @@
     }
   }
   
-  {
-    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());
@@ -21831,16 +20359,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -21886,16 +20404,6 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -21948,19 +20456,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -22013,19 +20509,7 @@
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -22249,9 +20733,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());
@@ -22296,19 +20778,7 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__Stem, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
-  {
-    ZVAL_STRINGL(*(args[0]), const_cast<char*>(arg1->data()), arg1->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -22395,9 +20865,7 @@
   {
     ZVAL_STRINGL(return_value, const_cast<char*>((&result)->data()), (&result)->size(), 1);
   }
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -22514,16 +20982,6 @@
   {
     SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_Xapian__TermGenerator, 1);
   }
-  /* Wrap this return value */
-  {
-    /* ALTERNATIVE Constructor, make an object wrapper */
-    zval *obj, *_cPtr;
-    MAKE_STD_ZVAL(obj);
-    MAKE_STD_ZVAL(_cPtr);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -22827,16 +21285,6 @@
   {
     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);
-    *_cPtr = *return_value;
-    INIT_ZVAL(*return_value);
-    *return_value=*_cPtr;
-  }
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23097,12 +21545,8 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[3]), const_cast<char*>(arg4->data()), arg4->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23158,9 +21602,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23209,9 +21651,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23343,12 +21783,8 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
-  {
-    ZVAL_STRINGL(*(args[3]), const_cast<char*>(arg4->data()), arg4->size(), 1);
-  }
+  
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23404,9 +21840,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
@@ -23455,9 +21889,7 @@
     }
   }
   
-  {
-    ZVAL_STRINGL(*(args[1]), const_cast<char*>(arg2->data()), arg2->size(), 1);
-  }
+  
   return;
 fail:
   zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());