s2w: Remove s2w_s2sonly, replace w/ s2w == '2'