Try to be more robust about diff parsing.