diff-highlight: refactor to prepare for multi-line hunks