Make --maxvars option work