fixup! Arcyd: use new branch abstraction to simplify
fixup! Arcyd: use new branch abstraction to simplify