Aligned some glib usage to the recent cleanup