Addressed some of the points raised in https://github.com/gem/oq-engine/pull/1182