Attempt to fix branching policy checks

Based on http://blogs.umass.edu/etosch/2014/03/19/static-analysis/:
Still works for top level branching tests, haven't tested it for more
complicated cases of branching subblocks yet