[Expression Language] Minor refractoring