(Wswan) Get rid of OP_RANGE usage