More fixes to switch arg tagger