Finish initial iteration of diff formatting.