Fixes to switch arg tagger