Use new codegen contexts for block/yield