fix: adjust BranchOp handling

The changeset not only includes fixes for how uncompressed separators
are represented through BranchOp, but also contains a refactor
to better encapsulate the update logic of BranchOp.