Replacing some manual iterations with standard algorithms. No functional changes intended.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@208783 91177308-0d34-0410-b5e6-96231b3b80d8