s2w: Code cleanup
s2w: Use s2s-only (s2w_switch == 2) properly