Making some minor improvements to r199626.

llvm-svn: 199663
3 files changed