diff --git a/ChangeLog b/ChangeLog
index de7f73188..09b9223b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-27  Mike Kestner  <mkestner@ximian.com>
+
+	* generator/MethodBody.cs : remove unnecessary generation for
+	Handle using out parameters.
+	* gtk/Gtk.Metadata : make TextIter opaque
+	* gtk/TextBuffer.custom : remove redundant dllimport
+	* gtk/gtk-api.xml : regen
+
 2004-01-27  Mike Kestner  <mkestner@ximian.com>
 
 	* gnome/Gnome.metadata : Icon.LookupSync mark factory param
diff --git a/generator/MethodBody.cs b/generator/MethodBody.cs
index f71c1a484..3fbbb3aec 100644
--- a/generator/MethodBody.cs
+++ b/generator/MethodBody.cs
@@ -111,7 +111,7 @@ namespace GtkSharp.Generation {
 
 				if (is_get) {
 					sw.WriteLine (indent + "\t\t\t" + p.CSType + " " + name + ";");
-					if (gen is ObjectGen || gen is OpaqueGen || p.CSType == "GLib.Value")
+					if (p.PassAs != "out" && (UsesHandle (gen) || p.CSType == "GLib.Value"))
 						sw.WriteLine(indent + "\t\t\t" + name + " = new " + p.CSType + "();");
 				}
 
diff --git a/generator/Parameters.cs b/generator/Parameters.cs
index e567b7abb..01c0fa13c 100644
--- a/generator/Parameters.cs
+++ b/generator/Parameters.cs
@@ -173,7 +173,7 @@ namespace GtkSharp.Generation {
 			
 			if (NullOk && !CSType.EndsWith ("IntPtr") && !(Generatable is StructBase))
 				call_parm = String.Format ("({0} != null) ? {1} : {2}", call_parm_name, call_parm, Generatable is CallbackGen ? "null" : "IntPtr.Zero");
-				
+
 			if (IsArray)
 				call_parm = call_parm.Replace ("ref ", "");
 
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 98b13c0f3..b4efa468f 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -5,6 +5,7 @@
   <attr path="/api/namespace/boxed[@cname='GtkSelectionData']" name="opaque">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='GetText']" name="hidden">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='SetText']" name="hidden">1</attr>
+  <attr path="/api/namespace/boxed[@cname='GtkTextIter']" name="opaque">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkTextIter']/method[@name='BackwardSearch']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="/api/namespace/boxed[@cname='GtkTextIter']/method[@name='BackwardToTagToggle']/*/*[@type='GtkTextTag*']" name="null_ok">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkTextIter']/method[@name='ForwardSearch']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
diff --git a/gtk/TextBuffer.custom b/gtk/TextBuffer.custom
index b9631afd0..2d6d03d3b 100644
--- a/gtk/TextBuffer.custom
+++ b/gtk/TextBuffer.custom
@@ -15,8 +15,6 @@ public void Clear ()
 }
 
 // overload to paste clipboard contents at cursor editable by default.
-[DllImport("libgtk-win32-2.0-0.dll")]
-static extern void gtk_text_buffer_paste_clipboard (IntPtr raw, IntPtr clip, IntPtr iter, bool default_edit);
 public void PasteClipboard (Gtk.Clipboard clipboard)
 {
 	gtk_text_buffer_paste_clipboard(Handle, clipboard.Handle, IntPtr.Zero, true);
diff --git a/gtk/gtk-api.xml b/gtk/gtk-api.xml
index e3f418d88..fabc73ff2 100644
--- a/gtk/gtk-api.xml
+++ b/gtk/gtk-api.xml
@@ -11636,7 +11636,7 @@
     </boxed>
     <struct name="TextBTree" cname="GtkTextBTree" opaque="true" />
     <struct name="TextCounter" cname="GtkTextCounter" opaque="true" />
-    <boxed name="TextIter" cname="GtkTextIter">
+    <boxed name="TextIter" cname="GtkTextIter" opaque="1">
       <field cname="dummy1" type="gpointer" />
       <field cname="dummy2" type="gpointer" />
       <field cname="dummy3" type="gint" />