More simplification [skip hazardlib][demos]
More simplification [skip hazardlib][demos]


Former-commit-id: 32070ed4a927be66d457fae9eee47e54eb513d69 [formerly 23ddfc3a0293a7f9f2cd4912f67307756f0d8cfe] [formerly 23ddfc3a0293a7f9f2cd4912f67307756f0d8cfe [formerly 854065bcaa9669bc8eed55fc58620c95fb869c41]]
Former-commit-id: 6b9663252de596983f9170bfc8996374cd8018e3
Former-commit-id: c1350f3989be2fc609df28cb52d3cd92291dc92d
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine