Fixup use of variables; no functional change.