Ported to latest Venne.