Small cleanup of diff, blame and cherry pick