- Refactored block final branches to use branch edge objects