Address some post-commit review comments on r217261