Unreviewed GTK/EFL gardening after r121121.