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


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