Small changes to support the refactoring on the engine side

Companion of https://github.com/gem/oq-engine/pull/1463