Fix up codegen-add for vars