Newer version of the script upstream
Code cleanup
Avoid a warning while building with Gtk+ 3.0