mvsw6171: clean up indirect mode stuff
use a slightly cleaner hack to probe switch
don't allow switch to register twice, or run fixup twice