Fix up variable assignments.