More fixes in heuristic p4 branch detection based on common path components.