Apply EO WG feedback.