Fix a var->val that got trampled in merge.