Part of LLVMControl refinement