Refactor to use unified for diff parsing