This should enable the diff2 code to be inserted with good "git blame" results for new code. I'm adding this early to catch any problems early.