Eo: Fix internal code using eo_composite functions.