Simon, it looks like there may have been a spaces/tabs issue that is marking half of the file as changed without any substantive changes.  It's hard to see what really got changed this way.  Any chance to revert "not really" changed lines here?