Unreviewed GTK+ gardening after r228270.