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


Former-commit-id: b1e698fa817268a2b779aed9c76a92ab7f5bbb9e [formerly b1e698fa817268a2b779aed9c76a92ab7f5bbb9e [formerly 4fc6081171cedd3e13edae49b2af01c8dd57575d]]
Former-commit-id: 06fbb78d7213e767b75f234586700ab32ecba6b8
Former-commit-id: 4596cc46db77ebf240cf3801346563f7d0d2588d
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine