Re-apply 101075 and fix it properly. Just reuse the debug info of the branch instruct...