Updated BRZs in calculator to use new branch types.