Add modifyVars support as option.