Remove default values from branch methods, and remove extra parameter for one caller