Removes some fuzziness and adds the -p diff option to show the C
function name in hunk headers.