diff --git a/moo/plugins/mooeditplugins.c b/moo/plugins/mooeditplugins.c
index 0408eea1..6168014b 100644
--- a/moo/plugins/mooeditplugins.c
+++ b/moo/plugins/mooeditplugins.c
@@ -19,7 +19,9 @@
 void
 moo_plugin_init_builtin (void)
 {
-    _moo_python_plugin_init ();
+    const char *v = g_getenv ("MOO_DISABLE_PYTHON");
+    if (!v || !*v)
+        _moo_python_plugin_init ();
     _moo_file_selector_plugin_init ();
     _moo_file_list_plugin_init ();
     _moo_find_plugin_init ();
diff --git a/tools/medit.supp b/tools/medit.supp
index 2c5862d4..407c691c 100644
--- a/tools/medit.supp
+++ b/tools/medit.supp
@@ -1,238 +1,58 @@
 {
-   inflateReset2
+   <foobar>
    Memcheck:Cond
    fun:inflateReset2
-   fun:inflateInit2_
 }
 
 {
-   gtk_label_set_markup
+   <foobar>
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
+   ...
    fun:gtk_label_set_markup
 }
 
 {
-   gtk_label_set_markup-2
+   <foobar>
    Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   fun:g_realloc
-   obj:/lib/libglib-2.0.so*
-   fun:g_string_sized_new
-   fun:pango_parse_markup
-   obj:/usr/lib/libgtk-x11-2.0.so*
-   fun:gtk_label_set_markup
-}
-
-{
-   XextAddDisplay
-   Memcheck:Leak
-   fun:malloc
+   ...
    fun:XInitExtension
 }
 
 {
-   gtk_label_set_markup-3
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strjoinv
-   fun:pango_font_description_from_string
-   obj:/usr/lib/libgtk-x11-2.0.so*
-   obj:/usr/lib/libgtk-x11-2.0.so*
-   fun:gtk_rc_get_style
-   obj:/usr/lib/libgtk-x11-2.0.so*
-   obj:/usr/lib/libgtk-x11-2.0.so*
-   obj:/usr/lib/libgtk-x11-2.0.so*
-   fun:gtk_label_set_markup
-}
-
-{
-   g_type_register_static
+   <foobar>
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
    obj:/usr/lib/libgobject-2.0.so*
    fun:g_type_register_static
+   fun:g_gtype_get_type
 }
 
 {
-   g_type_register_fundamental
+   <foobar>
    Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   fun:g_realloc
-   obj:/usr/lib/libgobject-2.0.so*
-   fun:g_type_register_fundamental
+   ...
+   obj:/usr/lib/libfreetype.so*
 }
 
 {
-   g_type_register_fundamental-2
+   <foobar>
    Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   obj:/usr/lib/libgobject-2.0.so*
-   fun:g_type_register_fundamental
-}
-
-{
-   g_type_add_interface_static
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   obj:/usr/lib/libgobject-2.0.so*
-   obj:/usr/lib/libgobject-2.0.so*
-   obj:/usr/lib/libgobject-2.0.so*
-   obj:/usr/lib/libgobject-2.0.so*
-   fun:g_type_add_interface_static
-}
-
-{
-   g_type_class_ref
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
-   fun:g_param_spec_string
-   obj:/usr/lib/libgtk-x11-2.0.so*
-   fun:g_type_class_ref
-}
-
-{
-   libclearlooks.so
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
-   obj:/usr/lib/libgobject-2.0.so*
-   obj:/usr/lib/libgtk-x11-2.0.so*
-   fun:gtk_widget_style_get_valist
-   fun:gtk_widget_style_get
-   obj:/usr/lib/gtk-2.0/2.10.0/engines/libclearlooks.so
-}
-
-{
-   gtk_widget_set_parent
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:pango_font_description_new
-   fun:pango_font_description_from_string
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   fun:gtk_rc_get_style
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   fun:gtk_widget_set_parent
-}
-
-{
-   gtk_widget_set_parent-2
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_string_sized_new
-   fun:g_string_new_len
-   obj:/usr/lib/libgobject-2.0.so.0.2515.0
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   obj:/usr/lib/gtk-2.0/2.10.0/engines/libclearlooks.so
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   fun:gtk_rc_get_style
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   fun:gtk_widget_set_parent
-}
-
-{
-   gtk_widget_set_parent-3
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strjoinv
-   fun:pango_font_description_from_string
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   fun:gtk_rc_get_style
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   fun:gtk_widget_set_parent
-}
-
-{
-   gtk_widget_set_parent-4
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_slist_copy
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   fun:gtk_rc_get_style
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2107.0
-   fun:gtk_widget_set_parent
-}
-
-{
-   gtk_scrolled_window_set_hadjustment
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_memdup
-   obj:/usr/lib/libgobject-2.0.so.0.2515.0
-   fun:g_type_class_ref
-   fun:g_type_class_ref
-   fun:g_type_class_ref
-   fun:g_object_new_valist
-   fun:g_object_new
-   fun:gtk_scrolled_window_set_hadjustment
-}
-
-{
-   g_type_register_static-2
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   obj:/usr/lib/libgobject-2.0.so.0.2515.0
-   obj:/usr/lib/libgobject-2.0.so.0.2515.0
-   fun:g_type_register_static
-}
-
-{
-   gtk_widget_set_name
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
+   ...
    fun:gtk_widget_set_name
 }
 
 {
-   gdk_pixbuf_loader_close
+   <foobar>
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
-   fun:gdk_pixbuf_set_option
-   obj:/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
-   obj:/lib/libpng12.so*
-   fun:png_process_data
-   obj:/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
-   obj:/usr/lib/libgdk_pixbuf-2.0.so*
-   fun:gdk_pixbuf_loader_close
+   ...
+   obj:/usr/lib/libgobject-2.0.so*
+   fun:g_type_register_fundamental
 }
 
 {
-   g_type_register_static-3
+   <foobar>
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
@@ -241,84 +61,152 @@
 }
 
 {
-   g_type_class_ref-2
+   <insert_a_suppression_name_here>
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_slist_prepend
-   fun:g_object_class_install_property
-   obj:/usr/lib/libgdk_pixbuf-2.0.so*
-   fun:g_type_class_ref
+   ...
+   fun:pango_shape
 }
 
 {
-   g_type_class_ref-3
+   <insert_a_suppression_name_here>
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_slist_prepend
-   fun:g_object_class_install_property
-   fun:g_type_class_ref
+   ...
+   fun:g_type_module_use
+   ...
+   fun:gtk_im_context_get_preedit_string
 }
 
 {
-   g_type_class_ref-4
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:gtk_module_init
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   obj:/usr/lib/libfontconfig.so*
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:gtk_text_layout_draw
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:g_type_add_interface_static
+}
+
+{
+   <insert_a_suppression_name_here>
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_memdup
-   obj:/usr/lib/libgobject-2.0.so.0.2515.0
+   obj:/usr/lib/libgobject-2.0.so*
    fun:g_type_class_ref
 }
 
 {
-   gtk_icon_set_add_source
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:calloc
+   fun:g_malloc0
+   fun:g_type_class_ref
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:g_type_create_instance
+   obj:/usr/lib/libgobject-2.0.so*
+   fun:g_object_newv
+   fun:g_object_new
+   obj:/usr/lib/libgtk-x11-2.0.so*
+   fun:gtk_main_do_event
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:gtk_widget_get_pango_context
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:gdk_pre_parse_libgtk_only
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:gtk_tool_button_set_label
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:g_object_class_install_property
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:gtk_spin_button_get_type
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:getpwnam_r@@*
+   obj:/lib/libglib-2.0.so*
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:gdk_window_process_updates
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:realloc
+   fun:g_realloc
+   obj:/usr/lib/libgobject-2.0*
+   fun:g_type_register_static
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:pango_layout_get_unknown_glyphs_count
+}
+
+{
+   <insert_a_suppression_name_here>
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_slice_alloc
-   obj:/lib/libglib-2.0.so*
-   fun:gtk_icon_set_add_source
-}
-
-{
-   getpwnam_r
-   Memcheck:Leak
-   fun:malloc
-   fun:nss_parse_service_list
-   fun:__nss_database_lookup
-   obj:*
-   obj:*
-   fun:getpwnam_r@@GLIBC_2.2.5
-   obj:/lib/libglib-2.0.so.0.2515.0
-}
-
-{
-   ft-malloc
-   Memcheck:Leak
-   fun:malloc
-   obj:/usr/lib/libfontconfig.so*
-}
-
-{
-   ft-realloc
-   Memcheck:Leak
-   fun:realloc
-   obj:/usr/lib/libfontconfig.so*
-}
-
-{
-   ft_mem_qalloc
-   Memcheck:Leak
-   fun:malloc
-   fun:ft_mem_qalloc
-}
-
-{
-   ft_mem_qrealloc
-   Memcheck:Leak
-   fun:realloc
-   fun:ft_mem_qrealloc
+   obj:/usr/lib/libgobject-2.0.so*
+   obj:/usr/lib/libgobject-2.0.so*
+   fun:g_type_register_static
 }
diff --git a/tools/run-valgrind.sh b/tools/run-valgrind.sh
index bd298ab6..6f9a7306 100755
--- a/tools/run-valgrind.sh
+++ b/tools/run-valgrind.sh
@@ -6,7 +6,10 @@ exec "$@"
 }
 
 export G_SLICE=always-malloc
-args="--tool=memcheck --log-file=medit-valgrind.log --num-callers=10 --error-limit=no --gen-suppressions=all --leak-check=full --leak-resolution=med --show-reachable=no --freelist-vol=100000000"
+export MOO_DISABLE_PYTHON=1
+
+args="--tool=memcheck --log-file=medit-valgrind.log --num-callers=50 --error-limit=no \
+--gen-suppressions=all --leak-check=full --leak-resolution=med --show-reachable=no --freelist-vol=100000000"
 # --track-fds=yes
 
 def_supp_file=`dirname $0`/medit.supp