Move bspatch/diff methods into one common