An important bug fix, and some minor cleanup.
Fixed a comment.
Removed some unnecessary code.
Fixed branch_vistors test to use new interface to normalize_branch_conditions