It's still not as simple as it should be because of the many duplicated
lines, but it's at least better than before.

llvm-svn: 187091