Update block scope handling for new ACP support in IR.