The branch ID could be used to specify protocol differences at some point. That would mean removing it from here down the line, of course.