Bug 7534: Disambiguate branchcode parameter, make it match between subroutines