Merge "Refactor handling of conditional branches with known result."