Fix some coding standard issues and delete a dead conditional.

llvm-svn: 244959
1 file changed