Query.hs: simplify implementation with a few new functions and code sharing

[smelc]

Changelog

- description: |
    Simplify implementation of queries with a few new functions and code sharing
# uncomment types applicable to the change:
  type:
  # - feature        # introduces a new feature
  # - breaking       # the API has changed in a breaking way
  # - compatible     # the API has changed but is non-breaking
  # - optimisation   # measurable performance improvements
  - refactoring    # QoL changes
  # - bugfix         # fixes a defect
  # - test           # fixes/modifies tests
  # - maintenance    # not directly related to the code
  # - release        # related to a new release preparation
  # - documentation  # change in code docs, haddocks...

Context

Code in Query.hs is hard to maintain and shuffle because of the noise of error handling. This PR aims to improve a bit on that.

How to trust this PR

• It's refactoring only
• It's +70/-167 🙂

Checklist

• Commit sequence broadly makes sense and commits have useful messages
• New tests are added if needed and existing tests are updated. See Running tests for more details
• Self-reviewed the diff

[palas]

I think I found a potential issue (maybe it is fine, but worth double checking). Other than that it looks good

[palas]

Looks good 👍