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


Former-commit-id: 458eee21d23659570a48d8098a7c6374ffa3a985 [formerly d86c06134194f700297c027dc4de547239f987d0]
Former-commit-id: f1c9d73fa1c2f19220aa581918801a9533899fc0
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine