Finish applying + fix David's llvm-lit patch.

Part of the error was mine (missed some lines!) and part is due to changes in the llvm-lit API.