This will make the API easier to use from bindings too. https://bugzilla.gnome.org/show_bug.cgi?id=750568