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


Former-commit-id: 69804c9ce88b8b51758762da61e0256f19c211e4 [formerly 46d2837f9716216b1946b89d02a88062487f1585]
Former-commit-id: b2c10ebc17079af285dfc5eb2afdf8d4770f9ece
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine