Fix defvar shadowing