Some more control flow support and tests, prune dead basic blocks