I was just looking at the above comment and noticed that you use `FinalStartLineNumber` 2X here. Should one of these be `rawhunk.OrigStartLineNumber`?