Replaced defvars with defparameters