Companion changes to https://github.com/gem/oq-risklib/pull/38