codegen fix for delayed/Avar