Bug fix.
Moved macros DEFVAR and DEFPARAMETER.