Minor cleanup, mostly reindenting. Remove one helper function that just called

the other helper functions, since we already differentiated the cases it was
testing between. No functionality change.

llvm-svn: 144167