Refactor Eo to build with EFL 1.8

Updated what 3adf9c2125 was missing.