diff --git a/valgrind.suppressions b/valgrind.suppressions
index 8d687f7b8..a6ffa13c9 100644
--- a/valgrind.suppressions
+++ b/valgrind.suppressions
@@ -3,6 +3,14 @@
 # file with "--suppressions=valgrind.suppressions" to disable lots of
 # bogus messages.
 
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_random_int
+}
+
 {
    g_main_context_dispatch
    Memcheck:Leak
@@ -17,53 +25,8 @@
 {
    g_main_context_default
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_slist_append
-   fun:g_main_context_new
-   fun:g_main_context_default
-}
-
-{
-   g_main_context_default
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_ptr_array_sized_new
-   fun:g_main_context_new
-   fun:g_main_context_default
-}
-
-{
-   g_main_context_default
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_main_context_new
-   fun:g_main_context_default
-}
-
-{
-   g_main_context_default
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_main_context_add_poll_unlocked
-   fun:g_main_context_new
-   fun:g_main_context_default
-}
-
-{
-   g_main_context_default
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_slist_prepend
-   fun:g_main_context_new
+   fun:?alloc
+   ...
    fun:g_main_context_default
 }
 
@@ -90,21 +53,34 @@
 }
 
 {
-   g_get_language_names
+   g_static_private_set
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
-   fun:g_get_language_names
+   fun:memalign
+   ...
+   fun:g_static_private_set
+}
+
+{
+   g_static_private_set
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_static_private_set
+}
+
+{
+   g_static_private_set
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_intern_static_string
 }
 
 {
    g_get_language_names
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strconcat
-   fun:_g_compute_locale_variants
+   fun:*alloc
+   ...
    fun:g_get_language_names
 }
 
@@ -112,136 +88,31 @@
    g_get_language_names
    Memcheck:Leak
    fun:memalign
-   fun:posix_memalign
-   fun:slab_allocator_alloc_chunk
-   fun:g_slice_alloc
-   fun:g_hash_table_new_full
-   fun:g_get_language_names
-}
-
-{
-   g_get_language_names
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_get_language_names
-}
-
-{
-   g_get_language_names
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_get_language_names
-}
-
-{
-   g_static_private_set
-   Memcheck:Leak
-   fun:realloc
-   fun:g_realloc
-   fun:g_array_maybe_expand
-   fun:g_array_set_size
-   fun:g_static_private_set
-}
-
-{
-   g_static_private_set
-   Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   fun:g_realloc
-   fun:g_array_maybe_expand
-   fun:g_array_set_size
-   fun:g_static_private_set
-}
-
-{
-   g_get_language_names
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_hash_table_insert_internal
-   fun:g_get_language_names
-}
-
-{
-   g_get_language_names
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_hash_table_insert_internal
-   fun:g_get_language_names
-}
-
-{
-   g_get_language_names
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_hash_table_resize
-   fun:g_hash_table_insert_internal
-   fun:g_get_language_names
-}
-
-{
-   g_get_language_names
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_hash_table_new_full
-   fun:g_get_language_names
-}
-
-{
-   g_get_language_names
-   Memcheck:Leak
-   fun:memalign
-   fun:posix_memalign
-   fun:slab_allocator_alloc_chunk
-   fun:g_slice_alloc
-   fun:g_slist_prepend
-   fun:g_strsplit
+   ...
    fun:g_get_language_names
 }
 
 {
    g_set_prgname
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
+   fun:*alloc
+   ...
    fun:g_set_prgname
 }
 
 {
    g_set_application_name
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
+   fun:*alloc
+   ...
    fun:g_set_application_name
 }
 
 {
    g_thread_init_glib
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_private_new_posix_impl
-   fun:_g_messages_thread_init_nomessage
-   fun:g_thread_init_glib
-}
-
-{
-   g_thread_init_glib
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_private_new_posix_impl
-   fun:_g_slice_thread_init_nomessage
+   fun:*alloc
+   ...
    fun:g_thread_init_glib
 }
 
@@ -253,188 +124,44 @@
    fun:g_slice_init_nomessage
 }
 
-{
-   g_thread_init_glib
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_private_new_posix_impl
-   fun:g_thread_init_glib
-}
-
-{
-   g_thread_init_glib
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_mutex_new_posix_impl
-   fun:_g_messages_thread_init_nomessage
-   fun:g_thread_init_glib
-}
-
-{
-   g_thread_init_glib
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_thread_self
-   fun:g_thread_init_glib
-}
-
-{
-   g_thread_init_glib
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_mutex_new_posix_impl
-   fun:_g_slice_thread_init_nomessage
-   fun:g_thread_init_glib
-}
-
-{
-   g_thread_init_glib
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_cond_new_posix_impl
-   fun:g_thread_init_glib
-}
-
-{
-   g_thread_init_glib
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_mutex_new_posix_impl
-   fun:g_thread_init_glib
-}
-
-{
-   g_thread_init_glib
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_mutex_new_posix_impl
-   fun:_g_mem_thread_init_noprivate_nomessage
-   fun:g_thread_init_glib
-}
-
 {
    g_get_filename_charsets
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
+   fun:*alloc
+   ...
    fun:g_get_filename_charsets
 }
 
-{
-   g_get_filename_charsets
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_get_filename_charsets
-}
-
-{
-   g_get_filename_charsets
-   Memcheck:Leak
-   fun:memalign
-   fun:posix_memalign
-   fun:slab_allocator_alloc_chunk
-   fun:g_slice_alloc
-   fun:g_array_sized_new
-   fun:g_static_private_set
-   fun:g_get_filename_charsets
-}
-
-{
-   g_get_filename_charsets
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_slice_alloc
-   fun:g_array_sized_new
-   fun:g_static_private_set
-   fun:g_get_filename_charsets
-}
-
-{
-   g_static_private_set
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_array_sized_new
-   fun:g_static_private_set
-}
-
-{
-   g_static_private_get
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_thread_self
-   fun:g_static_private_get
-}
-
 {
    g_get_charset
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
-   fun:g_get_charset
-}
-
-{
-   g_get_charset
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_get_charset
-}
-
-{
-   g_get_charset
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_slice_alloc
-   fun:g_array_sized_new
-   fun:g_static_private_set
-   fun:g_get_charset
-}
-
-{
-   g_get_charset
-   Memcheck:Leak
-   fun:memalign
-   fun:posix_memalign
-   fun:slab_allocator_alloc_chunk
-   fun:g_slice_alloc
-   fun:g_array_sized_new
-   fun:g_static_private_set
+   fun:*alloc
+   ...
    fun:g_get_charset
 }
 
 {
    openssl
    Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:engine_cleanup_add_last
-   fun:ENGINE_add
+   fun:*alloc
+   ...
    fun:ENGINE_load_dynamic
 }
 
 {
-   openssl
+   <insert_a_suppression_name_here>
    Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
+   fun:*alloc
+   ...
+   fun:g_data_initialize
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_resolver_get_default
 }
 
 {
@@ -442,197 +169,51 @@
    Memcheck:Leak
    fun:malloc
    fun:CRYPTO_malloc
-   obj:/usr/lib/libssl.so.0.9.8
+   ...
    fun:SSL_COMP_get_compression_methods
    fun:SSL_library_init
 }
 
 {
-   openssl
+   <insert_a_suppression_name_here>
    Memcheck:Leak
-   fun:malloc
+   fun:*alloc
    fun:CRYPTO_malloc
-   fun:sk_new
-   obj:/usr/lib/libssl.so.0.9.8
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-}
-
-{
-   openssl
-   Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:engine_cleanup_add_last
-   fun:ENGINE_add
-   fun:ENGINE_load_dynamic
+   ...
+   fun:ERR_get_state
 }
 
 {
    <insert_a_suppression_name_here>
    Memcheck:Leak
-   fun:malloc
+   fun:*alloc
    fun:CRYPTO_malloc
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:Curl_ossl_init
-   fun:curl_global_init
+   ...
+   fun:RSA_new_method
 }
 
 {
-   openssl
+   <insert_a_suppression_name_here>
    Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   obj:/usr/lib/libcrypto.so.0.9.8
-   obj:/usr/lib/libcrypto.so.0.9.8
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:Curl_ossl_init
-   fun:curl_global_init
-}
-
-{
-   openssl
-   Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   obj:/usr/lib/libcrypto.so.0.9.8
-   fun:ERR_get_state
-   fun:ERR_clear_error
-}
-
-{
-   <insert a suppression name here>
-   Memcheck:Leak
-   fun:malloc
-   fun:_dl_map_object_deps
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
+   fun:?alloc
+   ...
    fun:do_dlopen
-   fun:_dl_catch_error
-   fun:dlerror_run
-   fun:__libc_dlopen_mode
-   fun:pthread_cancel_init
 }
 
 {
    <insert_a_suppression_name_here>
    Memcheck:Leak
-   fun:calloc
-   fun:_dl_new_object
-   fun:_dl_map_object_from_fd
-   fun:_dl_map_object
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
+   fun:?alloc
+   ...
+   fun:dlopen*
 }
 
 {
    <insert_a_suppression_name_here>
    Memcheck:Leak
    fun:malloc
-   fun:_dl_new_object
-   fun:_dl_map_object_from_fd
-   fun:_dl_map_object
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:local_strdup
-   fun:_dl_map_object
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:calloc
-   fun:_dl_check_map_versions
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:_dl_map_object_deps
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:_dl_map_object_deps
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:_dl_new_object
-   fun:_dl_map_object_from_fd
-   fun:_dl_map_object
-   fun:openaux
-   fun:_dl_catch_error
-   fun:_dl_map_object_deps
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:local_strdup
-   fun:_dl_map_object
-   fun:openaux
-   fun:_dl_catch_error
-   fun:_dl_map_object_deps
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-}
-
-{
-   dlopen
-   Memcheck:Leak
-   fun:calloc
-   fun:_dlerror_run
-}
-
-{
-   dlopen
-   Memcheck:Leak
-   fun:malloc
-   fun:_dl_scope_free
-   fun:_dl_map_object_deps
-   fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-   fun:do_dlopen
-   fun:_dl_catch_error
-   fun:dlerror_run
+   ...
+   fun:dlclose
 }
 
 # is that a leak in libdbus?
@@ -640,42 +221,9 @@
 {
    <insert a suppression name here>
    Memcheck:Leak
-   fun:malloc
-   obj:/usr/lib/libdbus-1.so.3.4.0
-   obj:/usr/lib/libdbus-1.so.3.4.0
-   fun:avahi_client_new
-}
-
-{
-   <insert a suppression name here>
-   Memcheck:Leak
-   fun:malloc
-   obj:/usr/lib/libdbus-1.so.3.4.0
-   fun:dbus_message_unref
-   obj:/usr/lib/libdbus-1.so.3.4.0
-   fun:dbus_connection_send_with_reply_and_block
-   fun:dbus_bus_register
-   obj:/usr/lib/libdbus-1.so.3.4.0
-   fun:avahi_client_new
-}
-
-{
-   <insert a suppression name here>
-   Memcheck:Leak
-   fun:malloc
-   obj:/usr/lib/libdbus-1.so.3.4.0
-   fun:dbus_message_new_method_call
-   fun:dbus_bus_register
-   obj:/usr/lib/libdbus-1.so.3.4.0
-   fun:avahi_client_new
-}
-
-{
-   <insert a suppression name here>
-   Memcheck:Leak
-   fun:malloc
-   obj:/usr/lib/libdbus-1.so.3.4.0
-   obj:/usr/lib/libdbus-1.so.3.4.0
+   fun:?alloc
+   ...
+   obj:*/libdbus-*.so.*
    fun:avahi_client_new
 }
 
@@ -712,59 +260,12 @@
    fun:WildMidi_Init
 }
 
-{
-   g_quark_from_static_string
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_hash_table_new_full
-   fun:g_quark_from_static_string
-}
-
-{
-   g_quark_from_static_string
-   Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   fun:g_realloc
-   fun:g_quark_from_static_string
-}
-
 {
    g_quark_from_string
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
-   fun:g_quark_from_string
-}
-
-{
-   g_quark_from_string
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_hash_table_new_full
-   fun:g_quark_from_string
-}
-
-{
-   g_quark_from_string
-   Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   fun:g_realloc
-   fun:g_quark_from_string
-}
-
-{
-   g_quark_from_string
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_hash_table_new_full
-   fun:g_quark_from_string
+   fun:*alloc
+   ...
+   fun:g_quark_from_*
 }
 
 {
@@ -800,6 +301,134 @@
    fun:__nss_lookup_function
 }
 
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_type_init_with_debug_flags
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_type_register_static
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_type_add_interface_static
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_type_add_interface_check
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_type_interface_add_prerequisite
+}
+
+{
+   <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:*alloc
+   ...
+   fun:g_*_class_intern_init
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:type_iface_vtable_base_init_Wm
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_object_do_class_init
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_object_base_class_init
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:g_object_class_install_property
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:soup_*_class_intern_init
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:soup_auth_manager_add_type
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:soup_auth_manager_class_intern_init
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:soup_auth_manager_ntlm_class_intern_init
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:intern_header_name
+}
+
 {
    nss
    Memcheck:Leak
@@ -807,3 +436,18 @@
    fun:nss_parse_service_list
    fun:__nss_database_lookup
 }
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:?alloc
+   ...
+   fun:xmlInitParser
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:?alloc
+   fun:snd1_dlobj_cache_get
+}