[EM] Integrated pull request feedback.