Port AvoidGlobalVars to Parser