Address some post-commit review comments on r217261

llvm-svn: 217276
4 files changed