Another EL parser patch, trying to align it with the real EL parser