Use defvar instead of set-default