[EFL] Gardening after r118845 and r118851.