Ugh, fix bugs. Ok, so the last fix wasn't as great as I thought it was.

Now we're back to: 131.730u, 0.330s, which is still quite an improvement,
but still quite unacceptable

llvm-svn: 8322