Small refactoring.
Small refactoring.


Former-commit-id: 8b30fcfeac3475c7a2e29d5ffd0abcca2a9340dc [formerly 1c6d4fa212b86b08485699418defb845b89f1aac]
Former-commit-id: c2ff8ed79a29319af538cffb4161f91924bbd316
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine