Fix argument order for defvars