some diff hunk parser tweaks