@michaelcahill: git's diff on this file is insane -- it's basically old code out, new code in, the diff isn't useful.

I'd suggest just reviewing the new code and ignoring the diff.