Unreviewed GTK+ gardening after r237249.