sv: fix "sv o SRV; ...; sv d SRV" (bug 461) + code shrink