Another small refactoring
Another small refactoring


Former-commit-id: 58f841ea6c979d1e6305724772af76675ca7d3e1 [formerly d3524028e67a336f91d8937ca091b817eb8531fa]
Former-commit-id: b243c6decad2c8fb0fd7dcba29407e6a977ebd6c
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine