[PATCH] diff: consolidate various calls into diffcore.