src: branching improvements and fixes
src: less state arguments