diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index f4a80a7..85c6e41 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -1151,7 +1151,7 @@
         %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%CPPSELF.%FUNCTION_NAME());
       </inject-code>
       <modify-argument index="return">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="deleteLater()">
@@ -2671,7 +2671,7 @@
 
     <modify-function signature="addAnimation(QAbstractAnimation*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
 
@@ -2683,27 +2683,27 @@
 
     <modify-function signature="setTargetState(QAbstractState*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
 
     <modify-function signature="targetState() const">
       <modify-argument index="return">
-        <reference-count action="add" variable-name="setTargetState(QAbstractState*)1" />
+        <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" />
       </modify-argument>
     </modify-function>
 
 
     <modify-function signature="targetStates() const">
       <modify-argument index="return">
-        <reference-count action="add" variable-name="setTargetState(QAbstractState*)1" />
+        <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" />
       </modify-argument>
     </modify-function>
 
 
     <modify-function signature="setTargetStates(QList&lt;QAbstractState*&gt;)">
       <modify-argument index="1">
-        <reference-count action="add" variable-name="setTargetState(QAbstractState*)1" />
+        <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" />
       </modify-argument>
     </modify-function>
 
diff --git a/PySide/QtGui/optional/QSystemTrayIcon.xml b/PySide/QtGui/optional/QSystemTrayIcon.xml
index 095fcf3..4387590 100644
--- a/PySide/QtGui/optional/QSystemTrayIcon.xml
+++ b/PySide/QtGui/optional/QSystemTrayIcon.xml
@@ -3,7 +3,7 @@
     <enum-type name="MessageIcon"/>
     <modify-function signature="setContextMenu(QMenu*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
 </object-type>
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index a0e675a..737db78 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -1448,17 +1448,17 @@
     <enum-type name="State"/>
     <modify-function signature="setModel(QAbstractItemModel*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="setSelectionModel(QItemSelectionModel*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="setItemDelegate(QAbstractItemDelegate*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="model() const">
@@ -1558,12 +1558,12 @@
     </modify-function>
     <modify-function signature="setItemDelegate(QAbstractItemDelegate*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="setModel(QAbstractItemModel*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
   </object-type>
@@ -1776,7 +1776,7 @@
   <object-type name="QItemEditorFactory">
       <modify-function signature="registerEditor(QVariant::Type, QItemEditorCreatorBase *)">
       <modify-argument index="2">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
       <inject-code>
         Shiboken::Object::releaseOwnership(%PYARG_2);
@@ -2830,7 +2830,7 @@
     <modify-function signature="setupViewport(QWidget *)" access="non-final"/>
     <modify-function signature="setScene(QGraphicsScene*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="scene()const">
@@ -3271,7 +3271,7 @@
     <enum-type name="ModelSorting"/>
     <modify-function signature="setModel(QAbstractItemModel *)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="setPopup(QAbstractItemView *)">
@@ -3772,7 +3772,7 @@
     </extra-includes>
     <modify-function signature="setModel(QAbstractItemModel*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
   </object-type>
@@ -3989,7 +3989,7 @@
     </modify-function>
     <modify-function signature="setItemDelegate(QAbstractItemDelegate*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
 
@@ -4605,7 +4605,7 @@
     </modify-function>
     <modify-function signature="setItemDelegate(QAbstractItemDelegate *)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
@@ -4622,7 +4622,7 @@
     <modify-function signature="setModel(QAbstractItemModel *)">
       <modify-argument index="1">
         <no-null-pointer/>
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="autoCompletion()const" remove="all"/>
@@ -5174,7 +5174,7 @@
     </modify-function>
     <modify-function signature="setModelData(QWidget*,QAbstractItemModel*,QModelIndex)const">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
   </object-type>
diff --git a/PySide/QtMaemo5/typesystem_maemo5.xml b/PySide/QtMaemo5/typesystem_maemo5.xml
index 74715ea..803404d 100644
--- a/PySide/QtMaemo5/typesystem_maemo5.xml
+++ b/PySide/QtMaemo5/typesystem_maemo5.xml
@@ -47,7 +47,7 @@
   <object-type name="QMaemo5InformationBox">
     <modify-function signature="setWidget(QWidget*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
      </modify-function>
      <modify-function signature="paintEvent(QPaintEvent*)">
@@ -61,7 +61,7 @@
   <object-type name="QMaemo5ListPickSelector">
     <modify-function signature="setModel(QAbstractItemModel*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
 
diff --git a/PySide/QtSvg/typesystem_svg.xml b/PySide/QtSvg/typesystem_svg.xml
index 484864e..0592fc6 100644
--- a/PySide/QtSvg/typesystem_svg.xml
+++ b/PySide/QtSvg/typesystem_svg.xml
@@ -27,7 +27,7 @@
   <object-type name="QSvgGenerator">
     <modify-function signature="setOutputDevice(QIODevice*)">
       <modify-argument index="1">
-          <reference-count action="add"/>
+          <reference-count action="set"/>
       </modify-argument>
     </modify-function>
 
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml
index de359bb..43b82f7 100644
--- a/PySide/QtWebKit/typesystem_webkit.xml
+++ b/PySide/QtWebKit/typesystem_webkit.xml
@@ -31,7 +31,7 @@
   <object-type name="QWebView">
     <modify-function signature="setPage(QWebPage*)">
         <modify-argument index="1">
-            <reference-count action="add"/>
+            <reference-count action="set"/>
         </modify-argument>
     </modify-function>
     <modify-function signature="page() const">
@@ -77,12 +77,12 @@
 
    <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)">
         <modify-argument index="1">
-            <reference-count action="add"/>
+            <reference-count action="set"/>
         </modify-argument>
    </modify-function>
    <modify-function signature="networkAccessManager()const">
         <modify-argument index="return">
-            <reference-count action="add" variable-name="setNetworkAccessManager(QNetworkAccessManager*)1" />
+            <reference-count action="set" variable-name="setNetworkAccessManager(QNetworkAccessManager*)1" />
         </modify-argument>
    </modify-function>
    <modify-function signature="view()const">