Additional cleanup and fixes for Gtk+ 3.0