Improve return type for or
Restrict vector primitives to fx
Fix bug in branch-types and/or