Change lone setq into defvar