Resolve interface changes.

Resolve changes introduced by changing the internal data structure from
a vvorset to a orswot.