More refactoring [skip hazardlib]
More refactoring [skip hazardlib]


Former-commit-id: ae802bddca5e6a2749b711cd1d6bbde57f215a16 [formerly 47c5507127774ae3ce6f6317e38eba9515444ea9] [formerly 47c5507127774ae3ce6f6317e38eba9515444ea9 [formerly ffb630eb688aa4ea0ad17513efc131ed02737f32]]
Former-commit-id: 89592a4c8473675fa4db92e2597002b088bef86e
Former-commit-id: e6e27f2ca18ef7f4bd1fb7e35535c836b40f35de
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine