Make branches type-aware