Simplify some of the code. No functionality change.

llvm-svn: 184172
1 file changed