Update with breaking changes from sohva

The new version of sohva has some breaking changes in its interface.
Update to the new snapshot version, and fix uses of sohva classes.