Check in a bunch of minor fixes, plus a whole lot of #if 0'd out code, which...

Check in a bunch of minor fixes, plus a whole lot of #if 0'd out code, which will hopefully be enabled in the near future
This does not make any functionality changes

llvm-svn: 8355