One change I'm not folding in is the removal of two unused variables that caused warnings, because those were there for expository purposes. llvm-svn: 81721