Another switch arg tagger fix