Merging r168196: into the 3.2 release branch.

Make this easier to understand, as suggested by Chandler.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168594 91177308-0d34-0410-b5e6-96231b3b80d8